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
|
fce0c57c01
|
Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev
|
2024-06-21 01:28:22 +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 |
|
Chris Antol
|
f8dad38722
|
RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning
Bug: 327749022
Test: manual test
1. factory reset + launch Settings via ADB during Setup -> verify app closes
2. factory reset + bypass Setup + tap Settings icon in launcher -> verify app closes
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:70a5a0fd353cc6203d2926627de93786155ae5bc)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:477d4a8d6ba390ed0f9b150ca271966cd967820a)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d83f47397e61d5ec04866af20efcb935a58cbdff)
Merged-In: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
Change-Id: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
|
2024-06-18 17:35:47 +00:00 |
|
Chris Antol
|
2f0db305a6
|
RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning
Bug: 327749022
Test: manual test
1. factory reset + launch Settings via ADB during Setup -> verify app closes
2. factory reset + bypass Setup + tap Settings icon in launcher -> verify app closes
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:70a5a0fd353cc6203d2926627de93786155ae5bc)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:477d4a8d6ba390ed0f9b150ca271966cd967820a)
Merged-In: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
Change-Id: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
|
2024-06-18 17:33:30 +00:00 |
|
Chris Antol
|
b66997fc4e
|
RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning
Bug: 327749022
Test: manual test
1. factory reset + launch Settings via ADB during Setup -> verify app closes
2. factory reset + bypass Setup + tap Settings icon in launcher -> verify app closes
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:70a5a0fd353cc6203d2926627de93786155ae5bc)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:477d4a8d6ba390ed0f9b150ca271966cd967820a)
Merged-In: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
Change-Id: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
|
2024-06-18 17:33:24 +00:00 |
|
Chris Antol
|
d83f47397e
|
RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning
Bug: 327749022
Test: manual test
1. factory reset + launch Settings via ADB during Setup -> verify app closes
2. factory reset + bypass Setup + tap Settings icon in launcher -> verify app closes
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:70a5a0fd353cc6203d2926627de93786155ae5bc)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:477d4a8d6ba390ed0f9b150ca271966cd967820a)
Merged-In: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
Change-Id: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
|
2024-06-18 17:33:15 +00:00 |
|
Chris Antol
|
7f1c4df02d
|
RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning
Bug: 327749022
Test: manual test
1. factory reset + launch Settings via ADB during Setup -> verify app closes
2. factory reset + bypass Setup + tap Settings icon in launcher -> verify app closes
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:70a5a0fd353cc6203d2926627de93786155ae5bc)
Merged-In: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
Change-Id: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
|
2024-06-18 17:32:03 +00:00 |
|
Chris Antol
|
c02f4ee193
|
RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning
Bug: 327749022
Test: manual test
1. factory reset + launch Settings via ADB during Setup -> verify app closes
2. factory reset + bypass Setup + tap Settings icon in launcher -> verify app closes
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:70a5a0fd353cc6203d2926627de93786155ae5bc)
Merged-In: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
Change-Id: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
|
2024-06-18 17:21:57 +00:00 |
|
Bill Yi
|
5eb10526dc
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I80896e28e7043686f93756f82ed2c9beeac62df1
|
2024-06-17 00:08:47 -07:00 |
|
Treehugger Robot
|
ba400e5833
|
[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: I5cc79f583152d2402312cf0b49de95b930db1eb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:51:01 +00:00 |
|
Jason Chiu
|
22541a8377
|
[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: I7f7368a21df5731cdafc805e7ff729c2b959d61c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:50:58 +00:00 |
|
Treehugger Robot
|
6f4a788f83
|
[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: I9f7be5961184e0d3e3495b0b38ed41827938bef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:50:46 +00:00 |
|
Treehugger Robot
|
1fd30e8fba
|
[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: Idaca5e24548e72712196fc657dcb401f5022b63d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:50:37 +00:00 |
|
Jason Chiu
|
ebace9614a
|
[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: I0150ba1b5277ce7221689aaa60d719e758199b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:50:35 +00:00 |
|
Treehugger Robot
|
6ba7ae9d32
|
[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: I07c05e81014f6591d740a7e65ff5964437a9c060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:50:22 +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 |
|
Jason Chiu
|
7efa1c8090
|
[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 skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: I5c903948aab5c8bd5b45a4bf872eff21cf4be3c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:42:14 +00:00 |
|
Treehugger Robot
|
ebefb83789
|
[automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: ffb480aee4 am: ba599569fd -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27712008
Change-Id: I106744d88035ce315d5491b5de5e88db7568cc75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:41:52 +00:00 |
|
Treehugger Robot
|
ef935895f9
|
[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 skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: Iab945a284de0e514117d5e4632437fad8dcdf528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:28:48 +00:00 |
|
Jason Chiu
|
2e2afe97df
|
[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 skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: I788d8e2f400345bcc503340b78b8da1d5067f029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:28:38 +00:00 |
|
Treehugger Robot
|
4c59ec6eaf
|
[automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: 9e311f362a -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27712008
Change-Id: I5ce8ca87021a09185cd28e1c849a552ec42911fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:28:17 +00:00 |
|
Treehugger Robot
|
1120050213
|
[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 skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: I34cd431d434255ceae21126d48739865cd94ea18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:28:10 +00:00 |
|
Jason Chiu
|
a01c5efd63
|
[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 skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: I742ab432c52d3c3a29744f4275714890bc1bf918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:28:05 +00:00 |
|
Treehugger Robot
|
ba599569fd
|
[RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: ffb480aee4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27712008
Change-Id: I877be6871e43eb5d42c695b5cdb1faecdbc5305f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:27:49 +00:00 |
|
Treehugger Robot
|
506fc66f7c
|
[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 skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: I3704d899f9346dbf3d5656cb1129c936420065be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:13:33 +00:00 |
|
Treehugger Robot
|
5e90b5cfbb
|
[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 skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: Ibcfc0351a402dc967f216ef3e78d625e5ee897be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:13:30 +00:00 |
|
Jason Chiu
|
23bcaf74e8
|
[automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: I6a2ca71c7e51e72934b6308e0bb406adffc27c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:13:28 +00:00 |
|
Jason Chiu
|
19019740e0
|
[automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: Ibb5909cd0770cd53024555073ee9ebb03c899c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:13:24 +00:00 |
|
Treehugger Robot
|
ffb480aee4
|
[RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27712008
Change-Id: Ic0f5293649e322c4da6bbfcbce8486270436442e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:13:16 +00:00 |
|
Treehugger Robot
|
9e311f362a
|
[RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27712008
Change-Id: I4d3131026ca10b12c0b3bc16fa7d62b6562e5cdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 20:13:11 +00:00 |
|
Treehugger Robot
|
357d9ecbdb
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: I4a44ebe4dcfb8b12ebcadef6c746c0d8145a63c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 19:47:03 +00:00 |
|
Jason Chiu
|
8e61964dec
|
[automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: Ib30d02c3219aa0f4cb99ae0dc93de2a443133af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-12 19:46:56 +00:00 |
|
Bill Yi
|
f01466fb40
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If553c6c012ea240d79da980f0981f2b44ff0cf66
|
2024-06-11 16:34:25 -07:00 |
|
Treehugger Robot
|
49fc24f35d
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
|
2024-06-07 17:14:27 +00:00 |
|
Treehugger Robot
|
a339d8ea9a
|
[RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546875
Bug: 333364513
Fix: 345375093
Change-Id: Ifdebf7a60f3695f83d8fa04e05f4dbd6e177f62b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-07 02:49:14 +00:00 |
|
Bill Yi
|
aaabd291d2
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0899408e317dfa50cf5b450f8eb8b2a889976082
|
2024-06-06 18:57:44 -07:00 |
|
Bill Yi
|
49b772f03e
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4b8b7c0b9725b6afa65cc8aae6d72aa8acd11b60
|
2024-06-06 18:56:18 -07:00 |
|
Treehugger Robot
|
20f8ad98fb
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: I126a187cd8b358a2f5f0bfad8ebf2f7eec5665c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-06 07:56:53 +00:00 |
|
Jason Chiu
|
e0b4c24d20
|
[automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: I0f81495f91b6c7fde96a5a3b4c745cb81c9611ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-06 07:56:47 +00:00 |
|
Treehugger Robot
|
d0f5ccb499
|
Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: I9ba35ae426561f7ed7f69151b114d5645230a62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-06 07:42:17 +00:00 |
|
Jason Chiu
|
d0a4db88bb
|
[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: Iffc1b1f41b5cd22cec1bcfa530ad879f25b9073c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-06-06 07:42:10 +00:00 |
|
Treehugger Robot
|
952dbb9aa3
|
Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev
|
2024-06-06 07:30:05 +00:00 |
|
Treehugger Robot
|
324e36b19d
|
Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev
|
2024-06-06 07:30:05 +00:00 |
|