Angela Wang
378e9f073d
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: e9106f35ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: I8b271bdd8529fc596e5bf30132d0a1886e189fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 03:00:56 +00:00
ykhung
8f56114489
Record app optimization mode backup into BatteryHistoricalLog
...
App optimization mode format:
https://screenshot.googleplex.com/di9DDzBfYf7ihfV
App optimization mode backup format:
https://screenshot.googleplex.com/GkVW5HrgGvmv5yh
Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I60a9a76a8ffc89d625ee3f77c138a19181c81c38
2023-05-11 10:48:47 +08:00
Angela Wang
c4ff1e822f
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: 16fc56f72c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: I6088b5e1c4e5bb7db783ecca348e490c87b0a1d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:44:28 +00:00
TreeHugger Robot
d025a6f35d
Merge changes from topic "tc_change_2305100725_43" into udc-dev-plus-aosp am: d803091a4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: I9af5fc172e4427f80ab9b51d7e6b3aeee1615822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:42:42 +00:00
Bill Yi
2292bd9446
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a494fc7c5 2p: 40fae6e492 am: 77e2066906 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: I0b5c2fc3399dc4367f9871cad439da9b0138c3f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:42:37 +00:00
Bill Yi
c8c199020a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: Id8b9494bf8edd0e1ea401b95e3bdfc558c58eb49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:40:17 +00:00
Becca Hughes
8e9119f5ab
Show disable dialog box when none is selected
...
Also remove from CMPP since that will be
hidden.
Test: ondevice
Bug: 281147573
Merged-In: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
Change-Id: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
2023-05-11 02:28:54 +00:00
Angela Wang
e9106f35ce
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: Ifac01d28e06f50734882f9f8a04d3040809e3553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:20:02 +00:00
Angela Wang
16fc56f72c
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: I580326606ec0e281f42e57dd464be5265e9bf948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:15:50 +00:00
TreeHugger Robot
d803091a4b
Merge changes from topic "tc_change_2305100725_43" into udc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a494fc7c540fae6e4927a494fc7c5
2023-05-11 02:01:07 +00:00
Angela Wang
22d3116188
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev
2023-05-11 01:41:47 +00:00
Automerger Merge Worker
49f3ae7345
Merge changes from topic "am-6ee275e4b13e47869f6617c1da261643" into udc-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd11f279fcfb00769fdce26b8c61c9a6265171b600f54aaa1106d28f600d0e2dc66817edaf736477bbe69bec0564aff5a4b15435727e14e83b7b23acb827ef5fc280f2a8b2e09abe6f57545f07818309954e4c2e91c3
2023-05-10 23:32:27 +00:00
Treehugger Robot
980c2a5f24
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: 11f279fcfb -s ours am: 00769fdce2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I02c51c9ec66836adbcd276a462403f4ccf327039
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:32:05 +00:00
Bill Yi
a3656dc9b6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: 265171b600 -s ours am: f54aaa1106 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I2c48950146fcc247cec313fd5d2bcc668f8d8e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:32:02 +00:00
Treehugger Robot
59e7124304
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours am: 2dc66817ed -s ours am: af736477bb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: I03fb4e3e5ea46e7bb1e162a87793e0df7bddc6f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:31:59 +00:00
Bill Yi
8c210f44e0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours am: aff5a4b154 -s ours am: 35727e14e8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: I9ee4e2915206cb5fc4302d773dd4da7d014fff2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:31:40 +00:00
Treehugger Robot
c5fbb4e3ea
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: d8e8583c71 -s ours am: 560129e42f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: Ia473dbd2244c68d1f4217009298b6abf3ed5e9d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:31:31 +00:00
Bill Yi
c305ac507c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: 33dd95eda1 -s ours am: c1d77f492b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: Ie9082704296ce99f1632309394e8cdea630d9549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:31:29 +00:00
Treehugger Robot
6dd581d8c1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours am: 6ace5ad965 -s ours am: 275f119ae1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: I64026a6c5f583c41bd4b4c2a21553847b272a343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:31:26 +00:00
Treehugger Robot
ecc262f5fb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours am: 27ef5fc280 -s ours am: f2a8b2e09a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: Ieecf24774029493228b32345ce478299de1d224b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:31:20 +00:00
Bill Yi
6f45f4f389
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours am: 6cc5e5c226 -s ours am: ba6a55423d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: Ibe7d7a14feb62453f93fc7d939b74897239bfba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:31:06 +00:00
Bill Yi
526613d9b6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours am: 0781830995 -s ours am: 4e4c2e91c3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: I6e0542eddad665f1b4d907a0688e4e903aee5789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:31:02 +00:00
Treehugger Robot
6cdf599ce2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours am: 76d0d8c12b -s ours am: 8e1636b67d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: I76178e3dab505c564d784639c524328b2c8b94e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:30:47 +00:00
Bill Yi
1f75b586b6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours am: e578c1477f -s ours am: a8e65872e0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: Idb65a638fb0b9a2488f9c85ecd31c4d11fd7800c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:30:29 +00:00
Treehugger Robot
c4bd0a79ae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: d8e8583c71 -s ours am: bae0e18f93 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: Ida143d9b7600ae3b618188db4d8a898bfdc85f7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:28:31 +00:00
Bill Yi
3f76100838
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: 33dd95eda1 -s ours am: 951739e625 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: If6ff6476a5d251636883288b51c85d9caaa7cda5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:28:29 +00:00
Treehugger Robot
64a9cbe3b9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours am: 6ace5ad965 -s ours am: 7fd8c31e9b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: I29c0739ff4110c023769ecd87a7e5709d85b6909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:28:26 +00:00
Bill Yi
049ca9b48b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours am: 6cc5e5c226 -s ours am: 39b779caa7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: I7d18e041266b774ed6bb6f0e7887d5ae301b035e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:28:06 +00:00
Treehugger Robot
88259ac7d1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours am: 76d0d8c12b -s ours am: fee4798267 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: Ia4ece70ff1dc98610127976c59ae0cc336e44fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:27:47 +00:00
Bill Yi
67fcc6aea9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours am: e578c1477f -s ours am: e0ac237a6d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: Ie5c15a3a684d17fbfcbbffe049890c095788cb30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:27:29 +00:00
Hao Dong
755a67a931
Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen.
...
Bug: 279823572
Test: atest FingerprintSettingsFragmentTest
Test: atest ChooseLockGenericTest
Change-Id: Ie4bc18bf245eb7a755862401c710d85381063ff9
Merged-In: Ie4bc18bf245eb7a755862401c710d85381063ff9
2023-05-10 23:26:02 +00:00
Automerger Merge Worker
fc317b7fba
Merge changes from topic "am-6fd2dcf4e74d46fcb79ed43906079fe9" into udc-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7670083b52880a57f23266c1c35717d1cf4e9b4f8eb849c4b2e1420b8075227df01c9b1bdb0f81c752978dea76acce6f0f69f6e1ce0079f34ddf8255
2023-05-10 23:24:29 +00:00
Treehugger Robot
76859a2f06
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7670083b52 -s ours am: 880a57f232 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121673
Change-Id: I20e160a8597e20eaff1c80362283a300cbddfafa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:24:07 +00:00
Bill Yi
5c4d96c9c3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c1c35717 -s ours am: d1cf4e9b4f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121673
Change-Id: I5d6baff04c8ded091cc21172bae4a5afba7bddcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:24:05 +00:00
Treehugger Robot
1e378e1505
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8eb849c4b2 -s ours am: e1420b8075 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121134
Change-Id: Ic944201e59f83acfe9734a251eefcf82f8131a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:24:02 +00:00
Bill Yi
71473531c8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 227df01c9b -s ours am: 1bdb0f81c7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121134
Change-Id: Ib031c91ea9553668acda2dee914a6d2e3f3f0c95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:23:43 +00:00
Treehugger Robot
dcc1ff6230
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7670083b52 -s ours am: 89e35d0961 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121673
Change-Id: I2d4b0cf9c4dcf7ab89fa909ecab302280798bddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:23:38 +00:00
Bill Yi
e4f00cae5e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c1c35717 -s ours am: 6e8c9e284e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121673
Change-Id: I8f735334c8d0a4920b71b8460eff6efc82885008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:23:36 +00:00
Treehugger Robot
421612bc97
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8eb849c4b2 -s ours am: b6d69d6e4c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121134
Change-Id: Ia98e134d1f4cbf9fe767fad410395507647f8f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:23:33 +00:00
Treehugger Robot
f178329070
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 52978dea76 -s ours am: acce6f0f69 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121131
Change-Id: I6a6bcad9459538a03c48865c70ff3b38f964d71b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:23:24 +00:00
Bill Yi
397bc085ff
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 227df01c9b -s ours am: bd006fa2d0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121134
Change-Id: I560864bcab6a5ad42ab9e2df292a9206d1413602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:23:14 +00:00
Bill Yi
84b9a9863c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6e1ce0079 -s ours am: f34ddf8255 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121131
Change-Id: I24a2b39ab8ae27db3f11c9702f69ebecb0dc4bfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:23:05 +00:00
Treehugger Robot
f5e56b4992
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 52978dea76 -s ours am: 8353438b42 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121131
Change-Id: Ic00e7ea8c92a947c83458e7a0acf48ffd8e97c6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:22:54 +00:00
Bill Yi
ccc4b6a9cc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6e1ce0079 -s ours am: ca44a41e48 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121131
Change-Id: I4101d276d36a0ab1aca8b471f28dad6c603d71fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:22:36 +00:00
Treehugger Robot
00769fdce2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: 11f279fcfb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I7be84fe610cc0c426630681459c27889d9c5563c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:58:27 +00:00
Bill Yi
f54aaa1106
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: 265171b600 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I7c75d99616778004a99821e48dfc819c7b9528e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:58:18 +00:00
Treehugger Robot
af736477bb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours am: 2dc66817ed -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: I5fcc173dd6a0b9efbb49e6f6af1dd8ab584f5aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:58:15 +00:00
Bill Yi
35727e14e8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours am: aff5a4b154 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: If18bdfabf227aadb27a9e81e4628f671ae581dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:57:58 +00:00
Treehugger Robot
f2a8b2e09a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours am: 27ef5fc280 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: I7fef27d36f1f6a60c5917738a9756af6dd828437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:57:37 +00:00
Bill Yi
4e4c2e91c3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours am: 0781830995 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: I4378c2d4186e9b3ecbdfccc6f24393d1e5799726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:57:14 +00:00
