Bonian Chen
|
290fcb2d92
|
Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0 am: d4440db4bf am: b0e84295b6 am: a277c7a641
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902
Change-Id: Ib7211d7d26fa42cb2ce3d9e05a1caea5b073ca92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 02:15:05 +00:00 |
|
TreeHugger Robot
|
49b4e561ce
|
Merge "Show restricted message in Wi-Fi hotspot settings" into tm-dev am: cf52a8ea7d am: 23dab0bb02 am: 24f5f6d56c am: 1e3ddc9460
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18126022
Change-Id: I6224ed9bc02b8fd4d8e5ed658910e8cc93796148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 02:14:58 +00:00 |
|
TreeHugger Robot
|
3267ecd905
|
Merge "Fix the flashing list on Opening link page" into tm-dev am: e99683f013 am: c916acb354 am: eacedb46b2 am: f606826199
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087633
Change-Id: I4cf8ccc1a2af594e37695c026d71af4d0592f0a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 02:14:51 +00:00 |
|
Bonian Chen
|
dbe9e47dd3
|
Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev am: 337cfe6fc0 am: 99724f3a70 am: b2e6fce2fd am: b88cb65959
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090786
Change-Id: Ie9f1ae37880c51b0a7f412dc31b9f581a0d816cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 02:14:44 +00:00 |
|
Betty Chang
|
2f0a80e91c
|
Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2 am: b1fa93e7ef am: d7e9bcc43f am: 166d876738
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886
Change-Id: I11375b91dbae7517de8112eceeec201d28620f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 02:14:37 +00:00 |
|
Edgar Wang
|
22ffdce6dc
|
Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324 am: 22f7ab59c0 am: 2336ad01a9 am: 05255129d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962
Change-Id: Ie5ba27d08856248a19e971137cca769fdbf0c66e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 02:14:30 +00:00 |
|
Bill Yi
|
a4fd20322a
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours am: a8f28ed7c5 -s ours am: 551016f43b -s ours am: 41b6a6c820 -s ours am: a82a1ff84e -s ours am: 2e250b15ae -s ours am: 7cb788de49 -s ours am: c1eae1df36 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: I68a151896abdde270594e20c8a5c777eb7318641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 02:14:21 +00:00 |
|
Bill Yi
|
fb0a63c139
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours am: a8f28ed7c5 -s ours am: b8d61f99e0 -s ours am: 10abd90819 -s ours am: 4cef0633cc -s ours am: 61f36c7be1 -s ours am: 447f3eb1cb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: Ic3363283015617daee1cdd71b336a104bd8a26a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 02:14:11 +00:00 |
|
Bill Yi
|
9c97f931c2
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 0b07e79cc1 -s ours am: 365338b6d0 -s ours am: ec31d2697d -s ours am: 5568a2692b -s ours am: b17e079014 -s ours am: ad0ba2cc9e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054676
Change-Id: Ib3da149a03e05d445c7d92dfc5e655665f01f241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 02:14:02 +00:00 |
|
Bill Yi
|
78de2ab04c
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 7a2a5bd916 -s ours am: 1df006f84c -s ours am: 9f888216b4 -s ours am: ec8ffc26f0 -s ours am: 903ddfef62 -s ours am: f19529600f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062872
Change-Id: I01d17943c56daca95b3bcfd4ba4aae15f285ac0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 02:13:53 +00:00 |
|
Bill Yi
|
df3524ce9b
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 52bb0b7039 -s ours am: e7ce899b93 -s ours am: f93775c7da -s ours am: 9f7053b7cf -s ours am: bae8efd56b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054676
Change-Id: I7a3057a0a79ca95bef8ddfbba9f45786936d78b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 02:13:44 +00:00 |
|
Bill Yi
|
f00a4c11ca
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 4c08f33493 -s ours am: c77e41302b -s ours am: 38e89c3879 -s ours am: 0463d9f61c -s ours am: 96f5c08a27 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062872
Change-Id: I651129878dfc9361c56ccf222535bcb61760a679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 02:13:36 +00:00 |
|
TreeHugger Robot
|
6f76731f80
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours am: 6c9433b31e -s ours am: 2a21fa1024 -s ours am: e6ecfff870 -s ours am: 2f66f8b08b -s ours am: 160657c210 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054679
Change-Id: I4be0df203d602b2618b2be27eb28fc3937672e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 02:13:27 +00:00 |
|
Bill Yi
|
c2e788af04
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours am: 1a4297414e -s ours am: c0bf62368b -s ours am: 490f9dd7f4 -s ours am: 24e53cf988 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054679
Change-Id: Idf36eed462f4a8d78463321e09f74155e7cb7ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 02:13:25 +00:00 |
|
Bill Yi
|
524d4e9bbb
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours am: 53993399da -s ours am: 44f1eb9246 -s ours am: a01a68689f -s ours am: 06e71cc9c4 -s ours am: 221146e0b0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062875
Change-Id: Ic16ce2db6bbd390a7e7b54cb752c10b4a5e5dadb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 02:13:16 +00:00 |
|
Lucas Silva
|
db8221c3c4
|
Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: d7e5195565 am: ce24de4631 am: d58d7aa5df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768
Change-Id: I54da25f355443a7abd5784eacd404b1b71a43d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 02:13:08 +00:00 |
|
Joshua Mccloskey
|
5a761a8198
|
[automerger skipped] Merge "Fix final UDFPS enrollment haptic." into tm-dev am: 8f463f5c88 -s ours am: d7855afb3e -s ours am: 2dbdde4582 -s ours am: d9987e0e0f -s ours
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18083583
Change-Id: I3fd0ebc17bc9c03104885fc490432fe6f9f58953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 01:23:56 +00:00 |
|
Joshua McCloskey
|
9c5d9991c8
|
[automerger skipped] Fix final UDFPS enrollment haptic. am: b7f3001cea -s ours am: 8495275d81 -s ours am: e63e2c4483 -s ours am: 19cc020f09 -s ours
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18083583
Change-Id: I4d1e5d5452815bfb7968d46e910716a9037eb1d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 01:23:54 +00:00 |
|
Bonian Chen
|
03c63525b8
|
Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2 am: b32415b955 am: 907156d04f am: 0d3883baa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069
Change-Id: Ie34e03b41b9abfb787cd25b66b55bdc719094ac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 01:23:39 +00:00 |
|
Bonian Chen
|
10ebbc8cc3
|
Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410 am: 01e97e371e am: 2718dea3f8 am: 409e87760d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870
Change-Id: Icc6b3133ae8e4bd3d1fb53d38d14590823d88aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 01:18:54 +00:00 |
|
TreeHugger Robot
|
a1c78fb744
|
Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a am: d1c67e389d am: 5c851b28f7 am: fbcb6198ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823
Change-Id: I6514ff6216854d2b5a1ec71c3c777fa3ad4f20ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 01:18:44 +00:00 |
|
Jan Tomljanovic
|
205aef1cb5
|
Merge "Update the SafetyCenter icon" into tm-dev am: 297028ea69 am: 3c357dec8a am: 1ef1f750e8 am: e228d4e72d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029249
Change-Id: I96902fa4e606d45835455521fc2456d573b133ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 01:18:33 +00:00 |
|
TreeHugger Robot
|
485a0f01ff
|
Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb am: 1c16e6b314 am: 431c7ede2b am: 3d4ffc67d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822
Change-Id: Ibb698f3d818c78996ba7da9d13462168c31956c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 01:18:23 +00:00 |
|
TreeHugger Robot
|
0c0d2fa0ba
|
Merge "Remove tab symbol for app pinning strings" into tm-dev am: 5d31a69d65 am: 7d1f75839d am: 5ed72fae84 am: 070850b528
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030885
Change-Id: I828ac0530a2967162822f460248c6560c8665853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 01:18:12 +00:00 |
|
Chaohui Wang
|
046eada25e
|
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd am: 19356dae5d am: 74030a5bc5 am: f75897acd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070
Change-Id: I8c3b09809c23a65129075ae001c286bf36ebee7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 01:18:02 +00:00 |
|
Tom Hsu
|
79e8a03137
|
Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev am: 1d0f85a3d6 am: 169517aacc am: 3521d0420c am: 71b96c18e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030882
Change-Id: Ia4be127d847c382f082d0c4f942855c76966424d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 01:17:47 +00:00 |
|
Arc Wang
|
aa4ed4d454
|
Merge "Prevent side channel package installation enumeration" into tm-dev am: a3c7f8482a am: 7a530c79ec am: 3af1d90a43 am: 2c4a835b27
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944167
Change-Id: Ib2cb37141b2529801dc3d9d3194b9a56dad4edd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 00:55:22 +00:00 |
|
Julia Reynolds
|
d445fe4252
|
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec am: 1f912cbfe3 am: d9d09bf112 am: a7c0ce5cae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961
Change-Id: I1f5c6c718dd5690af4a6965d905d8997cd313f00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 00:21:07 +00:00 |
|
TreeHugger Robot
|
e8650ff934
|
Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29 am: 6708570e2c am: d266df1531 am: a00a24bace
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824
Change-Id: I23da6999595cd81c735734d0c422844825438700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 00:20:53 +00:00 |
|
Calvin Pan
|
747688b636
|
Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f am: 38fac79ee6 am: 492fdaf058 am: 3e087ae99d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006
Change-Id: Id404a57859b3dc049967e2ae39962f97a0e716ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 00:15:38 +00:00 |
|
Betty Chang
|
65fbc878a2
|
Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5 am: ec17c47421 am: 3ea06f174e am: 8ed506d860
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166
Change-Id: Ib5c4b12d00956d6855839552db03ebab01b1564e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 00:13:25 +00:00 |
|
TreeHugger Robot
|
81b94adb78
|
Merge changes from topic "tc_change_32"
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4d117cbc4
Import translations. DO NOT MERGE ANYWHERE
|
2022-05-03 23:31:48 +00:00 |
|
Bill Yi
|
9aefbd74f6
|
Merge "Import translations. DO NOT MERGE ANYWHERE"
|
2022-05-03 20:49:52 +00:00 |
|
Bonian Chen
|
a277c7a641
|
Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0 am: d4440db4bf am: b0e84295b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902
Change-Id: I42c8bc63a1b788d33c907f2e9187d524c4c846f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-03 18:50:44 +00:00 |
|
TreeHugger Robot
|
1e3ddc9460
|
Merge "Show restricted message in Wi-Fi hotspot settings" into tm-dev am: cf52a8ea7d am: 23dab0bb02 am: 24f5f6d56c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18126022
Change-Id: I70231e2631700c0b52c528e68d2bda92dc3faa2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-03 18:50:37 +00:00 |
|
TreeHugger Robot
|
f606826199
|
Merge "Fix the flashing list on Opening link page" into tm-dev am: e99683f013 am: c916acb354 am: eacedb46b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087633
Change-Id: Icaf417f44ab9cd94b1928fa1e7672ce2232f7902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-03 18:50:31 +00:00 |
|
Bonian Chen
|
b88cb65959
|
Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev am: 337cfe6fc0 am: 99724f3a70 am: b2e6fce2fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090786
Change-Id: I2dc2443aa7cb9823dfb02c42e4284e8496ef1250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-03 18:50:24 +00:00 |
|
Betty Chang
|
166d876738
|
Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2 am: b1fa93e7ef am: d7e9bcc43f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886
Change-Id: I8b4d682f657f61dc6dbf3850a5d38d347682b4c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-03 18:50:17 +00:00 |
|
Edgar Wang
|
05255129d2
|
Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324 am: 22f7ab59c0 am: 2336ad01a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962
Change-Id: I7b0e1863257ff579131ac7d2a60323004efaac68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-03 18:50:11 +00:00 |
|
Bill Yi
|
c1eae1df36
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours am: a8f28ed7c5 -s ours am: 551016f43b -s ours am: 41b6a6c820 -s ours am: a82a1ff84e -s ours am: 2e250b15ae -s ours am: 7cb788de49 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: If0c452c3dd20a02ee292c5a32b81b07b9ad8d794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-03 18:50:03 +00:00 |
|
Bill Yi
|
447f3eb1cb
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours am: a8f28ed7c5 -s ours am: b8d61f99e0 -s ours am: 10abd90819 -s ours am: 4cef0633cc -s ours am: 61f36c7be1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: Iee56c1e74644c8de7ef8d297f05bcbef1f1da201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-03 18:49:54 +00:00 |
|
Bill Yi
|
ad0ba2cc9e
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 0b07e79cc1 -s ours am: 365338b6d0 -s ours am: ec31d2697d -s ours am: 5568a2692b -s ours am: b17e079014 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054676
Change-Id: Idb22c1c2a6e61d8ea1383a2bd13874ea3bcff16a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-03 18:49:46 +00:00 |
|
Bill Yi
|
f19529600f
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 7a2a5bd916 -s ours am: 1df006f84c -s ours am: 9f888216b4 -s ours am: ec8ffc26f0 -s ours am: 903ddfef62 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062872
Change-Id: I4250d03aadcfe5e620514c4afb1d2bf3ba58323f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-03 18:49:38 +00:00 |
|
Bill Yi
|
bae8efd56b
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 52bb0b7039 -s ours am: e7ce899b93 -s ours am: f93775c7da -s ours am: 9f7053b7cf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054676
Change-Id: I722b82827edb811a756a01d342cf1935baff8ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-03 18:49:32 +00:00 |
|
Bill Yi
|
96f5c08a27
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 4c08f33493 -s ours am: c77e41302b -s ours am: 38e89c3879 -s ours am: 0463d9f61c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062872
Change-Id: I82f80b9a101343801407c070d4bdbdddb7b54c68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-03 18:49:25 +00:00 |
|
TreeHugger Robot
|
160657c210
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours am: 6c9433b31e -s ours am: 2a21fa1024 -s ours am: e6ecfff870 -s ours am: 2f66f8b08b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054679
Change-Id: Ie5986f35f949cdac39969740cf1583647fb38d14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-03 18:49:17 +00:00 |
|
Bill Yi
|
24e53cf988
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours am: 1a4297414e -s ours am: c0bf62368b -s ours am: 490f9dd7f4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054679
Change-Id: I5e819224dc59ff3e132ed4898b48fee99dbc5caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-03 18:49:16 +00:00 |
|
Bill Yi
|
221146e0b0
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours am: 53993399da -s ours am: 44f1eb9246 -s ours am: a01a68689f -s ours am: 06e71cc9c4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062875
Change-Id: I07552578b28c7d2b073c569e65d0dc7b4ac64bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-03 18:49:08 +00:00 |
|
Lucas Silva
|
d58d7aa5df
|
Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: d7e5195565 am: ce24de4631
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768
Change-Id: I2666f5a835f99adaf3f1ffea68066b3a74ff582b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-03 18:45:06 +00:00 |
|
Joshua Mccloskey
|
d9987e0e0f
|
[automerger skipped] Merge "Fix final UDFPS enrollment haptic." into tm-dev am: 8f463f5c88 -s ours am: d7855afb3e -s ours am: 2dbdde4582 -s ours
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18083583
Change-Id: Ie1665ad48f4fa7349ee26d9da5b1d0588dfad0e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-03 18:24:44 +00:00 |
|