Commit Graph

123829 Commits

Author SHA1 Message Date
Automerger Merge Worker
ae378da8f0 Merge changes from topic "am-bc0f5b1e049c4551981e48bace3fae31" into udc-dev am: 15b34f0425 -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/+/27675440

Change-Id: I8f24f90aa93d266404548a22389bff4dbc80679a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 03:03:51 +00:00
Chris Antol
e2219ba0a0 [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: ea8267d642 -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: I226e903ad6f861f66beb31c08713b5b76e712d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 03:03:41 +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
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
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
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
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
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
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
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
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
Chris Antol
c2f70df823 [automerger skipped] Ignore fragment attr from ext authenticator resource am: e2dc98c21d -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: Id94c41c0985dad28470519ff96b7ff19f61dc0dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:56:00 +00:00
Chris Antol
ce0820929a [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev am: d8a7ed649b -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: I6400c6e725af571d9d947a8370a580ffc16da130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:55:58 +00:00
Chris Antol
4b73fbdb8e Merge "Ignore fragment attr from ext authenticator resource" into udc-dev am: 79ab22ba51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675438

Change-Id: I4dbdf1e36fc580ac00f812d904bca9ad1c31ae1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:55:42 +00:00
Chris Antol
5691154dbb [automerger skipped] Ignore fragment attr from ext authenticator resource am: f5e9b0167a -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: I67bccdf9d45b2d3a9bf1fcb62128b67ea6f6131a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:55:39 +00:00
Chris Antol
1a8d068be8 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -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: I94d528dc3241926d72bdd795a7b27f5365f08645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:49:19 +00:00
Chris Antol
dd1692a16d [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -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: I54aacf80026eda2fc70766a243e4ccfff216868f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:49:17 +00:00
Chris Antol
f3a110e707 [automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2f6 -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: I3a8cee5ecf58f17876f2fa27e69582c4cd7ba01c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:49:16 +00:00
Chris Antol
2d9969176b [automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2f6 -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: I3da5c4afe6754373d047f9e8a9fb186e16ec80c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:49:12 +00:00
Chris Antol
9e31e01946 Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3 am: 6b5d026668 am: 7a2e7aac88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295

Change-Id: I3d6fcf2ba1fc2765b4ba8d1a01dfba69289126e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:48:49 +00:00
Chris Antol
383cbae5a3 Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3 am: 6b5d026668 am: 7a2e7aac88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295

Change-Id: I70b72fa0ac4f7dd5db7ff02e3edba7867263c6b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:48:44 +00:00
Chris Antol
79ab22ba51 Merge "Ignore fragment attr from ext authenticator resource" into udc-dev 2024-06-21 01:29:41 +00:00
Chris Antol
0c15f71ece Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev 2024-06-21 01:29:23 +00:00
Chris Antol
d8a7ed649b Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev 2024-06-21 01:29:10 +00:00
Chris Antol
4b073bf14c Merge "Ignore fragment attr from ext authenticator resource" into tm-dev 2024-06-21 01:28:56 +00:00
Chris Antol
7a2e7aac88 Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3 am: 6b5d026668
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295

Change-Id: I93a5ce93076055af691dc61cf7f2d32c45bd2fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:17:57 +00:00
Chris Antol
6b5d026668 Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295

Change-Id: I0d6b47560df6c7df5e9e56b6fd3336dcc63da78e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 00:55:00 +00:00
Chris Antol
b6e9e08ae3 Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295

Change-Id: I2a62051844b3296e49fb6941b36af02c93a95803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 00:35:21 +00:00
Chris Antol
c5031de185 Merge "Ignore fragment attr from ext authenticator resource" into sc-dev 2024-06-21 00:14:16 +00:00
Treehugger Robot
e9842d18db [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours am: 506fc66f7c -s ours am: 1120050213 -s ours am: 352bcbcbc4 -s ours
am skip reason: contains skip directive

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

Change-Id: I6d0339ce017b28453db66ce246b30b526fd0192b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 20:50:42 +00:00
Jason Chiu
8666ed7ac1 [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours am: 23bcaf74e8 -s ours am: a01c5efd63 -s ours am: 7efa1c8090 -s ours
am skip reason: contains skip directive

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

Change-Id: I3dfeaf4f28497dc5f9347a0499128a8499803e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 20:50:38 +00:00
Treehugger Robot
ebf3f4cee6 [automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: ffb480aee4 am: ba599569fd -s ours am: ebefb83789 -s ours
am skip reason: contains skip directive

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

Change-Id: I06806f376737ae09894da936a9af96815b9709a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 20:50:28 +00:00
Treehugger Robot
b1cdb2abae [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours am: 5e90b5cfbb -s ours am: ef935895f9 -s ours
am skip reason: contains skip directive

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

Change-Id: I735f7f4d36e80e97f57285c78fb1bddba04e56b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 20:50:18 +00:00
Jason Chiu
e28d3aaa38 [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours am: 19019740e0 -s ours am: 2e2afe97df -s ours
am skip reason: contains skip directive

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

Change-Id: I21f27be0c29c55c3479cbca5c32a63aefd7b36c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 20:50:15 +00:00
Treehugger Robot
296a7877e9 [automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: 9e311f362a -s ours am: 4c59ec6eaf -s ours
am skip reason: contains skip directive

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

Change-Id: Ib4188d0d43873de613df0fcda2ee5a4dc12b3960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 20:50:03 +00:00
Treehugger Robot
352bcbcbc4 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours am: 506fc66f7c -s ours am: 1120050213 -s ours
am skip reason: contains skip directive

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

Change-Id: I193844aa8bf3765981c94c5d6b250435d14282fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 20:42:18 +00:00