Commit Graph

141625 Commits

Author SHA1 Message Date
Chris Antol
7333342e83 [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: 3770cefc65 -s ours am: 648e47b1ef -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: I62ede4d5e09970f5d2a8971f946402e42f398d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 03:03:21 +00:00
Chris Antol
71a631458e [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev am: 0c15f71ece -s ours am: b14a76b7f8 -s ours am: ce34a63260 -s ours am: f7ab988622 -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: I6e5b62bc427bce99825f149ef0f8e88672d3c8e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 03:03:15 +00:00
Chris Antol
f6d812a155 [automerger skipped] Ignore fragment attr from ext authenticator resource am: e2dc98c21d -s ours am: c2f70df823 -s ours am: 8b8a307671 -s ours am: 769aa43a24 -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: I43209e5a9846e872767d09b555545611b25843eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 03:03:11 +00:00
Chris Antol
47995251b2 [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: 3770cefc65 -s ours am: 648e47b1ef -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: Ib22df5ff5441974d6bd724673c6ac5339f59d525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 03:02:56 +00:00
chelseahao
4b85389124 [Audiosharing] Increase test coverage for audio stream states.
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Flag: com.android.settingslib.flags.enable_le_audio_qr_code_private_broadcast_sharing
Bug: 345686602
Change-Id: I91d9a45abd4c9659c9d0ddeca5f5aaefed36f820
2024-06-21 11:00:54 +08:00
Chris Antol
1dcd330a0c [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: fcc9252a67 -s ours am: e7cf908cb4 -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: I07418ba4f8e2ff25f2d1ed8eeaf44a5264f4ef58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:34:35 +00:00
Chris Antol
aef507959d [automerger skipped] Ignore fragment attr from ext authenticator resource am: abf11e7350 -s ours am: 2d4f02e360 -s ours am: c66ea394a4 -s ours am: bb9e14f93d -s ours am: 7ebdef372b -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: I4a686b3ed0cc2e925b2202295f29f7d40c295b47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:34:29 +00:00
Automerger Merge Worker
6faee05799 Merge changes from topic "am-beae6d45c4f54e539026901c293ffe26" into udc-dev
* changes:
  [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev am: 0c15f71ece -s ours am: b14a76b7f8 -s ours am: 43dd6d2c82 -s ours am: 332aca2baa -s ours
  [automerger skipped] Ignore fragment attr from ext authenticator resource am: e2dc98c21d -s ours am: c2f70df823 -s ours am: 84fed529a2 -s ours am: f761c7f291 -s ours
2024-06-21 02:34:24 +00:00
Chris Antol
ef3b4ee860 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev am: 0c15f71ece -s ours am: b14a76b7f8 -s ours am: 43dd6d2c82 -s ours am: 332aca2baa -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: I9fa7a571fbfc47547752d2c6346b08085d858606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:34:14 +00:00
Automerger Merge Worker
167fa8f063 Merge changes from topic "am-7c932fc208fa4104bc73a89be5614517" into udc-dev
* changes:
  [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: ef1fb71944 -s ours
  [automerger skipped] Ignore fragment attr from ext authenticator resource am: abf11e7350 -s ours am: 2d4f02e360 -s ours am: c66ea394a4 -s ours am: bb34749bb2 -s ours
2024-06-21 02:34:11 +00:00
Chris Antol
072d0f2e56 [automerger skipped] Ignore fragment attr from ext authenticator resource am: e2dc98c21d -s ours am: c2f70df823 -s ours am: 84fed529a2 -s ours am: f761c7f291 -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: Ifdab1823cbe741b9ebddb3ecf1eaad10afaad06a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:34:09 +00:00
Automerger Merge Worker
15b34f0425 Merge changes from topic "am-bc0f5b1e049c4551981e48bace3fae31" into udc-dev
* changes:
  [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -s ours am: dd1692a16d -s ours am: ee9775b8f7 -s ours
  [automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2f6 -s ours am: 2d9969176b -s ours am: 3898449358 -s ours
2024-06-21 02:34:04 +00:00
Chris Antol
678597cc3d [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: ef1fb71944 -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: I8b50e3516bdb4ea2f16d438e309be00665220272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:34:01 +00:00
Chris Antol
eed1c3d5f6 [automerger skipped] Ignore fragment attr from ext authenticator resource am: abf11e7350 -s ours am: 2d4f02e360 -s ours am: c66ea394a4 -s ours am: bb34749bb2 -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: I6fcf9267c42b291b1795ee06e141674ba9c19bd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:33:56 +00:00
Chris Antol
ea8267d642 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -s ours am: dd1692a16d -s ours am: ee9775b8f7 -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: I1ed5f2c162182dd8f72ee657818d49a02198fa18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:33:54 +00:00
Chris Antol
da6511eb6b [automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2f6 -s ours am: 2d9969176b -s ours am: 3898449358 -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: Ib4abae20c828ee7b33c61503acdbd6c3f4382311
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:33:48 +00:00
Chris Antol
f7ab988622 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev am: 0c15f71ece -s ours am: b14a76b7f8 -s ours am: ce34a63260 -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: I83d09ef5f784a9b25abc6bf4a3fbc08982aec893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:33:41 +00:00
Chris Antol
769aa43a24 [automerger skipped] Ignore fragment attr from ext authenticator resource am: e2dc98c21d -s ours am: c2f70df823 -s ours am: 8b8a307671 -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: Ic2dd04f36d92b61773f78cf2b7ec11fc5741eb6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:33:35 +00:00
Chris Antol
e7cf908cb4 [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: fcc9252a67 -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: Id32976aed7f1daf83c3e06dff9f358c6b1923643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:33:23 +00:00
Chris Antol
7ebdef372b [automerger skipped] Ignore fragment attr from ext authenticator resource am: abf11e7350 -s ours am: 2d4f02e360 -s ours am: c66ea394a4 -s ours am: bb9e14f93d -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: Ic43340baa75277463d13a1e270f735b4f0a1ac79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:33:18 +00:00
Chris Antol
648e47b1ef [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: 3770cefc65 -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: Ib866366307a46dd39fd718a9ab7220ea01f13c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:33:07 +00:00
Chris Antol
332aca2baa [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev am: 0c15f71ece -s ours am: b14a76b7f8 -s ours am: 43dd6d2c82 -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: I5dcbf9b07bffb25c09842b93dd071080b077dc1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:33:04 +00:00
Chris Antol
f761c7f291 [automerger skipped] Ignore fragment attr from ext authenticator resource am: e2dc98c21d -s ours am: c2f70df823 -s ours am: 84fed529a2 -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: Ifd3038a74c1d47b1c049ff1ec061986e0bbbc6b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:32:58 +00:00
Chris Antol
9e0e43dca5 [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: 4dc3fba31e -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: Iaab54dd3c4a0ba8dcdc9e53d002db5488b9ba3cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:20:18 +00:00
Chris Antol
319e35039a [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: bd6ca6f54a -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: Ib951c4defaecdfe0576ff06d6ed926e2e87f847d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:20:10 +00:00
Automerger Merge Worker
d7c60694e8 Merge "[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" into main 2024-06-21 02:20:04 +00:00
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