Commit Graph

141599 Commits

Author SHA1 Message Date
Automerger Merge Worker
84da94783a Merge changes from topic "am-be9c4f61597346b5907ba69dadf65eb4" into main
* changes:
  [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -s ours am: 1a8d068be8 -s ours am: f5bb4f2aa6 -s ours am: d1e10278c5 -s ours
  [automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2f6 -s ours am: f3a110e707 -s ours am: 32d00469c8 -s ours am: 7e7cd0627a -s ours
2024-06-21 02:19:58 +00:00
Chris Antol
948c4e4dcc [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3 am: 6b5d026668 am: 7a2e7aac88 am: 9e31e01946 -s ours am: 7e8fa4b3ce -s ours am: 0f328c28e2 -s ours am: d0c167f882 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295

Change-Id: I350d2591a422fdcc35176b5813879e103cc88d2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:19:55 +00:00
Automerger Merge Worker
c9b769fbc4 Merge changes from topic "am-31ce508f6d2e4100bf03b765275d4e1a" into main
* changes:
  [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev am: d8a7ed649b -s ours am: ce0820929a -s ours am: 64fb2b4168 -s ours am: bafba4df6f -s ours
  [automerger skipped] Ignore fragment attr from ext authenticator resource am: f5e9b0167a -s ours am: 5691154dbb -s ours am: a77217943b -s ours am: d4d25bf811 -s ours
2024-06-21 02:19:49 +00:00
Chris Antol
fe88f8e1cd [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -s ours am: 1a8d068be8 -s ours am: f5bb4f2aa6 -s ours am: d1e10278c5 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675440

Change-Id: I4626cef521d7253e63dd1553de4e20fbf5fd4145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:19:49 +00:00
Chris Antol
45684e4b56 [automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2f6 -s ours am: f3a110e707 -s ours am: 32d00469c8 -s ours am: 7e7cd0627a -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675440

Change-Id: I6cec0ab9eafb48c800a92f7e37144e5d84a712e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:19:45 +00:00
Chris Antol
5bdcb7bae7 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev am: d8a7ed649b -s ours am: ce0820929a -s ours am: 64fb2b4168 -s ours am: bafba4df6f -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439

Change-Id: I6ee6d6a83ea7fa960e15ed9421c0d0f10d1eac57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:19:35 +00:00
Chris Antol
4dc3fba31e [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -s ours am: 1a8d068be8 -s ours am: f5bb4f2aa6 -s ours am: b1abe5874a -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675440

Change-Id: I36b3bc2571648e35f2bbf9a5e7420bb1f644a002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:19:34 +00:00
Chris Antol
bd6ca6f54a [automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2f6 -s ours am: f3a110e707 -s ours am: 32d00469c8 -s ours am: 85cd715e74 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675440

Change-Id: Ibb84691d50949c82570c68d3e92d90b483dee04c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:19:30 +00:00
Chris Antol
70906b163a [automerger skipped] Ignore fragment attr from ext authenticator resource am: f5e9b0167a -s ours am: 5691154dbb -s ours am: a77217943b -s ours am: d4d25bf811 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439

Change-Id: I7bee2bf3570b577327b0b61f2340ac1fd93ab066
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:19:29 +00:00
Chris Antol
6994337dee [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3 am: 6b5d026668 am: 7a2e7aac88 am: 9e31e01946 -s ours am: 7e8fa4b3ce -s ours am: 8ca43bf8aa -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295

Change-Id: Iae5ec8470e0ffa52e74bd77dff163ccd5d5c75d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:19:26 +00:00
Automerger Merge Worker
4d6ec14c80 Merge "Merge "Ignore fragment attr from ext authenticator resource" into udc-dev am: 79ab22ba51 am: 4b73fbdb8e am: 9891ce6e7f" into main 2024-06-21 02:19:24 +00:00
Automerger Merge Worker
9a2d4d233b Merge changes from topic "am-10ffa8e8305d4d019a219ab9a33932df" into main
* changes:
  [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev am: d8a7ed649b -s ours am: ce0820929a -s ours am: 6c03aeba9c -s ours
  [automerger skipped] Ignore fragment attr from ext authenticator resource am: f5e9b0167a -s ours am: 5691154dbb -s ours am: a65a820d87 -s ours
2024-06-21 02:19:21 +00:00
Chris Antol
d0c167f882 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3 am: 6b5d026668 am: 7a2e7aac88 am: 9e31e01946 -s ours am: 7e8fa4b3ce -s ours am: 0f328c28e2 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295

Change-Id: I3520a85421b732b6bd7d37701e8c0069819cc892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:19:16 +00:00
Chris Antol
ef036de735 Merge "Ignore fragment attr from ext authenticator resource" into udc-dev am: 79ab22ba51 am: 4b73fbdb8e am: 9891ce6e7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675438

Change-Id: I5811fef27cecfafbd9badafd60434f3abf59d198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:19:13 +00:00
Chris Antol
fe519cf503 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev am: d8a7ed649b -s ours am: ce0820929a -s ours am: 6c03aeba9c -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439

Change-Id: I26e6441db7f88c01421cee8fd007d274c8232fdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:19:07 +00:00
Chris Antol
bafba4df6f [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev am: d8a7ed649b -s ours am: ce0820929a -s ours am: 64fb2b4168 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439

Change-Id: Iaeafd2c4b2dc0bd0fe9ed88fa3c85cc4c5b4bcdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:59 +00:00
Chris Antol
e280464e25 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into udc-qpr-dev am: 07da5ed640 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676182

Change-Id: Id34c4f613681ed0d2c01101c8f6135ae54788c7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:59 +00:00
Chris Antol
4cc45f185f [automerger skipped] Ignore fragment attr from ext authenticator resource am: f5e9b0167a -s ours am: 5691154dbb -s ours am: a65a820d87 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439

Change-Id: I3281f7cc032372826b0dc3ecb96f43a6efab6902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:59 +00:00
Chris Antol
d4d25bf811 [automerger skipped] Ignore fragment attr from ext authenticator resource am: f5e9b0167a -s ours am: 5691154dbb -s ours am: a77217943b -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439

Change-Id: Ic0633ace415f0a792d9252f4d4e0f3cd64d4dd41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:54 +00:00
Chris Antol
37b28d8d58 [automerger skipped] Ignore fragment attr from ext authenticator resource am: 8607f3a34e -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676182

Change-Id: I9c8884b42e663623f0b4c77b4071af3a76611a22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:54 +00:00
Chris Antol
fcc9252a67 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev am: fce0c57c01 -s ours am: 0b4c1120ef -s ours am: cd0dbf0048 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676296

Change-Id: Ifb045f2f72ba0d1332f304e715210b4e16fe4b36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:42 +00:00
Chris Antol
9891ce6e7f Merge "Ignore fragment attr from ext authenticator resource" into udc-dev am: 79ab22ba51 am: 4b73fbdb8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675438

Change-Id: I9543e8aece37c81f65b6e84ef13fdbb4463ec8d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:42 +00:00
Chris Antol
bb9e14f93d [automerger skipped] Ignore fragment attr from ext authenticator resource am: abf11e7350 -s ours am: 2d4f02e360 -s ours am: c66ea394a4 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676296

Change-Id: Ifed3d08a7a6bda4c32727d6b298dd71d5f437db2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:40 +00:00
Chris Antol
ef1fb71944 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev am: fce0c57c01 -s ours am: 0b4c1120ef -s ours am: cd0dbf0048 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676296

Change-Id: I139d51fe915aa0dcbef772bfb9b23cfcfb511747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:39 +00:00
Chris Antol
d1e10278c5 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -s ours am: 1a8d068be8 -s ours am: f5bb4f2aa6 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675440

Change-Id: I940231df088e691be7257e24628f6153dd271e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:37 +00:00
Chris Antol
bb34749bb2 [automerger skipped] Ignore fragment attr from ext authenticator resource am: abf11e7350 -s ours am: 2d4f02e360 -s ours am: c66ea394a4 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676296

Change-Id: I574b3e5e5f278d5c46cc297294c079620051daa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:36 +00:00
Chris Antol
7e7cd0627a [automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2f6 -s ours am: f3a110e707 -s ours am: 32d00469c8 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675440

Change-Id: I5d8c5c0016552a291803a77f35e30791ffd09439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:34 +00:00
Chris Antol
43dd6d2c82 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev am: 0c15f71ece -s ours am: b14a76b7f8 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 24e2f2d2f6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675441

Change-Id: Ic3335b63d8db8f3c83b089b965ff8eaaa4cfa20c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:27 +00:00
Chris Antol
ce34a63260 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev am: 0c15f71ece -s ours am: b14a76b7f8 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 24e2f2d2f6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675441

Change-Id: I163f978618f1e78fb33c151d99da196fb6b16cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:24 +00:00
Chris Antol
84fed529a2 [automerger skipped] Ignore fragment attr from ext authenticator resource am: e2dc98c21d -s ours am: c2f70df823 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 24e2f2d2f6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675441

Change-Id: I6fd8b1f57dad36bf77339a7f00fae134c1434b34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:23 +00:00
Chris Antol
8ca43bf8aa [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3 am: 6b5d026668 am: 7a2e7aac88 am: 9e31e01946 -s ours am: 7e8fa4b3ce -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295

Change-Id: I5057240366b73128a0231d9da65114fbbc40ac49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:22 +00:00
Chris Antol
8b8a307671 [automerger skipped] Ignore fragment attr from ext authenticator resource am: e2dc98c21d -s ours am: c2f70df823 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 24e2f2d2f6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675441

Change-Id: I7aa7bd7607b042697c80ffff577814a3e988ab73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:21 +00:00
Chris Antol
b1abe5874a [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -s ours am: 1a8d068be8 -s ours am: f5bb4f2aa6 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675440

Change-Id: I7fa1676c74010467ce5a533bafa22c5b7cadcdea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:13 +00:00
Chris Antol
85cd715e74 [automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2f6 -s ours am: f3a110e707 -s ours am: 32d00469c8 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675440

Change-Id: I1617df7b1e53b291a35e5b752cb2eb1ddb0be90c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:09 +00:00
Chris Antol
a09dec69be Merge "Ignore fragment attr from ext authenticator resource" into udc-dev am: 79ab22ba51 am: 5f9fdfe17e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675438

Change-Id: Ic98bd29c665dbc63d68ae81560d7cbc6f081643c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:05 +00:00
Chris Antol
0f328c28e2 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3 am: 6b5d026668 am: 7a2e7aac88 am: 9e31e01946 -s ours am: 7e8fa4b3ce -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295

Change-Id: I66803914bce1ef0b46ac4e69dd18d222a94744ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:17:57 +00:00
Chris Antol
f5bb4f2aa6 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -s ours am: 1a8d068be8 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675440

Change-Id: Ie7550c405f3c82d315d73367b1f45c5974364dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:11:39 +00:00
Chris Antol
32d00469c8 [automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2f6 -s ours am: f3a110e707 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675440

Change-Id: Ida19b276bde8e1c9ee55a35de8a588c280888c73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:11:34 +00:00
Chris Antol
ee9775b8f7 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -s ours am: dd1692a16d -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675440

Change-Id: I698c256cb9c738d7714fd4b9b139a666453fc975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:10:49 +00:00
Chris Antol
3898449358 [automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2f6 -s ours am: 2d9969176b -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675440

Change-Id: I8611ac4db89646a9a4c31b507b9144bbe27d9de7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:10:45 +00:00
Chris Antol
7e8fa4b3ce [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3 am: 6b5d026668 am: 7a2e7aac88 am: 9e31e01946 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295

Change-Id: I559c2ed9f68683dfd083ae4034b7908dd703e5d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:10:43 +00:00
Chris Antol
3770cefc65 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3 am: 6b5d026668 am: 7a2e7aac88 am: 383cbae5a3 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 f5e9b0167a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295

Change-Id: Ia02b01d19beb37195120284e9c04485d5c758ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:10:34 +00:00
Chris Antol
6c03aeba9c [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev am: d8a7ed649b -s ours am: ce0820929a -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439

Change-Id: I6b68efac561d877ee58ff37f41b7919b9faa37a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:03:25 +00:00
Chris Antol
a65a820d87 [automerger skipped] Ignore fragment attr from ext authenticator resource am: f5e9b0167a -s ours am: 5691154dbb -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439

Change-Id: I5c46e21c4ea8be48e668086d9d4292a3af0ed437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:03:22 +00:00
Chris Antol
64fb2b4168 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev am: d8a7ed649b -s ours am: ce0820929a -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439

Change-Id: I47c97dacf96c21ab48d1b3d2047e87d2a0744a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:03:03 +00:00
Chris Antol
a77217943b [automerger skipped] Ignore fragment attr from ext authenticator resource am: f5e9b0167a -s ours am: 5691154dbb -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439

Change-Id: I25669252c7b2a6488c8031ef5d130b3ac4dd97f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:02:57 +00:00
Chris Antol
07da5ed640 Merge "Ignore fragment attr from ext authenticator resource" into udc-qpr-dev 2024-06-21 01:56:46 +00:00
Chris Antol
cd0dbf0048 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev am: fce0c57c01 -s ours am: 0b4c1120ef -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676296

Change-Id: If90692fe73b063ea6ce13a5d7be6ca02a5783dfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:56:25 +00:00
Chris Antol
c66ea394a4 [automerger skipped] Ignore fragment attr from ext authenticator resource am: abf11e7350 -s ours am: 2d4f02e360 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676296

Change-Id: Ie6c3494f1e3afe5de2639294204178cbc8ca421c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:56:19 +00:00
Chris Antol
b14a76b7f8 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev am: 0c15f71ece -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 24e2f2d2f6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675441

Change-Id: I8360aa9ea4dccb569401cfac271b7f30d4faf196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:56:07 +00:00