Bill Yi
128036a053
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379717
Change-Id: I48a6bc9f16fcae2bb4ccaeff9f11e68d236f74a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 02:28:19 +00:00
Bill Yi
affa411d4e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379717
Change-Id: I078f8199a995e10e791117c367bfcc68f5e0905a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 02:28:03 +00:00
Daniel Huang
1dd13430cc
Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd am: 35d25a92d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079
Change-Id: Iefd86e0d9ef6f948d634d8c89580362e0324d35b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 02:26:43 +00:00
Bill Yi
07b6109a0f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-05-24 01:54:48 +00:00
Daniel Huang
35d25a92d1
Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079
Change-Id: I622fae34b50f1a07963d2ada5e6b0d5445d3635c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 01:47:42 +00:00
Daniel Huang
dd8283f708
Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079
Change-Id: I285f4552d871aeccbbead17b85b43cdb317e6868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 01:43:12 +00:00
Yuxin Hu
0183cfd816
Fix "Enable ANGLE" switch behavior when Developer Option Switch is off
...
Fix below bugs:
1) When developer option switch is turned off,
"Enable ANGLE" switch is not disabled. Fixed it in
GraphicsDriverEnableAngleAsSystemDriverController::update().
2) When user turns off developer option switch,
a restart is not always mandatory. However, we should ask
user to restart the device is "Enable ANGLE" is forced to
change due to developer option switch turning off.
Fixed it in DevelopmentSettingsDashboardFragment::onSwitchChanged().
3) When user turns off developer option switch and
the reboot dialog pops up, user can dismiss the dialog by
not clicking either POSITIVE_BUTTON or NEGATIVE_BUTTON.
We should enforce user to click the button and disallow the
option to dimiss the dialog by touching screen areas
outside the window's bounds.
Fixed it in DisableDevSettingsDialogFragment.java.
Did a few clean-up and in
GraphicsDriverEnableAngleAsSystemDriverController.java, and updated
unit test to reflect new code behavior.
Bug: b/270994705
Test: m; flash and device can boot.
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest GraphicsDriverEnableAngleAsSystemDriverControllerTest
Test: atest SettingsRoboTests:FreeformWindowsPreferenceControllerTest
Test: atest SettingsRoboTests:DesktopModePreferenceControllerTest
Change-Id: I199b2fe59b6ad948b753793254c822a293d8b40d
2023-05-24 01:37:35 +00:00
Bill Yi
da001b042c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 0fd5495eff -s ours am: 16b592fb33 -s ours am: 73a02b6b63 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: Ifc9c27e0d2641a435c407a78dc17b423c1518994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 01:33:46 +00:00
Bill Yi
a58f127b31
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: 2ab5a7908f -s ours am: 5c826f73d1 -s ours am: efbd369d04 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I3f05418f04a7e5aa9eece3cdafa40837c2a7deb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 01:33:23 +00:00
Bill Yi
29a29b1115
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours am: c40e106be2 -s ours am: d2bd70c172 -s ours am: 0388f986a9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379713
Change-Id: I14b2f517d2a3938a0027debc4b02c4cad14eb73f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 01:32:28 +00:00
Bill Yi
15a9320fda
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -s ours am: e379726b51 -s ours am: 2ccfd19de9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I982b1c7da6d073240d7986133efd70e4a27fca87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 01:27:26 +00:00
Bill Yi
cf55a34b9c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -s ours am: 1187b059e5 -s ours am: 2b3db795c2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I7fc0860b1d3482488a1900266cd75240d65020f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 01:27:03 +00:00
Bill Yi
e4f0727aa6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours am: c40e106be2 -s ours am: 1288b1b851 -s ours am: 110d4e79b6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379713
Change-Id: Ie03fcf40bb4dd2a3c944c716f95c1223391259d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 01:25:52 +00:00
Daniel Huang
e51bbfcbbd
Merge "Update summary for Languages and Keyboard" into udc-dev
2023-05-24 01:09:38 +00:00
Bill Yi
5edb31bd42
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours am: c40e106be2 -s ours am: d2bd70c172 -s ours am: dda3891316 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379713
Change-Id: I9621f50fd3ebb617d2816b91b76d086e25c70290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 01:05:46 +00:00
Bill Yi
e54a0e6a62
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -s ours am: e379726b51 -s ours am: 6b6386163e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: Ib6249bc6031a2fba787ac2cf8853a3398fb86d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 01:03:11 +00:00
Bill Yi
3f6346370d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -s ours am: 1187b059e5 -s ours am: a7016867de -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I361d7425ec6254dc0f700d5d2f73b165eff85f73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 01:02:48 +00:00
Bill Yi
73a02b6b63
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 0fd5495eff -s ours am: 16b592fb33 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I3ba891ee1b7cde3ec6fd546e664cb111da49fadb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 01:01:16 +00:00
Bill Yi
efbd369d04
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: 2ab5a7908f -s ours am: 5c826f73d1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I2e418bfff28333fe31b85f9ffb3cafd4b23ddaf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 01:00:54 +00:00
Bill Yi
b84c9d2576
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -s ours am: 5a18114757 -s ours am: 8ea4882c07 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I3d154f09ab2a44079615c66f1332327d90be6cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:44:10 +00:00
Bill Yi
b8a491486e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -s ours am: 45604d8938 -s ours am: e6a8da6540 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I6c2d0024663ab125c701041054a75a5fa8833514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:43:48 +00:00
Bill Yi
31ae0474ae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c13633d1d0 -s ours am: fa94aa39eb -s ours am: 84540eb406 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379996
Change-Id: I94afd7a5783af1be6fd649828bee9753b1e3313a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:42:34 +00:00
Bill Yi
56dc6413be
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -s ours am: 7e4689c960 -s ours am: da3133ac63 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379996
Change-Id: I8426313d54034a43f2f5b018bd5ef24584c54caf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:42:32 +00:00
Bill Yi
797fc344f1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -s ours am: c5bca3f94f -s ours am: ad0d23056a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379722
Change-Id: If857f5844013c467d4aa3b3704045a3f9caa5ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:42:26 +00:00
Bill Yi
88cdc5a2d8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -s ours am: dc957a0cae -s ours am: 7c4360c9dc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379722
Change-Id: I72d080a9603da5264919c0c22eec58aa570859a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:42:02 +00:00
Bill Yi
e82ceae8a0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -s ours am: 2833f69afa -s ours am: ae1eb664b7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379718
Change-Id: I1a0efafaa04073299300e139fa4c48608a382310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:41:38 +00:00
Bill Yi
ecdf2f198e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384 -s ours am: 59aaf2dd32 -s ours am: 98d36bda87 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379718
Change-Id: I649f981cda60fb71a3b2bc47a1f0c4c880586d7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:41:18 +00:00
Bill Yi
6c96711315
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c13633d1d0 -s ours am: 425f03d8c2 -s ours am: 49158d6ab2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379996
Change-Id: Ib843b5665481067fa874833d27ae85824831d5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:39:33 +00:00
Bill Yi
b8333888c0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -s ours am: 0ff2acd74e -s ours am: 8704f31c3e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379996
Change-Id: I6bfd360d9f6c470c89ae5a4bee67ef59630083c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:39:31 +00:00
Bill Yi
a71ca08160
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -s ours am: 851cd09273 -s ours am: b5f465a035 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379722
Change-Id: Ia35e0c6a5b2bae2732acfc95c2f040dfb212f617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:39:24 +00:00
Bill Yi
d9c3cd288d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -s ours am: 90323d459e -s ours am: 5a8bc21cf6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379722
Change-Id: Ie0fc3ea3d5cd552ed7f49bb0dbdd20e1eb74713e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:39:01 +00:00
Bill Yi
dda3891316
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours am: c40e106be2 -s ours am: d2bd70c172 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379713
Change-Id: I8368936078d5b07935010bedfb2d89a223ca988d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:38:56 +00:00
Bill Yi
9ee59b6702
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -s ours am: 6f9dae1c63 -s ours am: 553e0f65e2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379718
Change-Id: I67fc4640fd0237240ec197fa04a7007f19baad11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:38:37 +00:00
Bill Yi
e6acd2dc6d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384 -s ours am: c02f810e09 -s ours am: 4c53bc8ff3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379718
Change-Id: I3e65a6164e95265afe76f2b7187e44ee2e07d3fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:38:16 +00:00
Bill Yi
16b592fb33
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 0fd5495eff -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I17347f326903f75319cf56721d655d2580ffc3cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:38:04 +00:00
Bill Yi
5c826f73d1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: 2ab5a7908f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I174c307d5304487623087a622622ebbe83474e33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:37:23 +00:00
Bill Yi
0388f986a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours am: c40e106be2 -s ours am: d2bd70c172 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379713
Change-Id: Ie2bf4bca72c00095f4af32868bbdefdd23aaef9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:36:57 +00:00
Bill Yi
6b6386163e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -s ours am: e379726b51 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I2210bd369ee794147cb9dae766dcd54d8b3fae6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:36:28 +00:00
Bill Yi
a7016867de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -s ours am: 1187b059e5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I4b60f9cbc3aa924fa961e31d96ca9afe827bf80c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:36:06 +00:00
Bill Yi
2ccfd19de9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -s ours am: e379726b51 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I764baa7ea2b74c6fc4a67b769d2d2c70f8c813c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:33:46 +00:00
Bill Yi
2b3db795c2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -s ours am: 1187b059e5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I92a52c63f8eb9d43d38dd574b393a8f3a921eebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:33:23 +00:00
Bill Yi
110d4e79b6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours am: c40e106be2 -s ours am: 1288b1b851 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379713
Change-Id: Ida41cef3d5069a28e1c5d54b44a0840b934ef724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:31:53 +00:00
Bill Yi
8ea4882c07
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -s ours am: 5a18114757 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: Ie1e60c0681d96023d5091d1881e118d7b3492a4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:31:02 +00:00
Bill Yi
e6a8da6540
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -s ours am: 45604d8938 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I98342989f2743b9b9129cf7555f5c1a2a6a4a552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:30:38 +00:00
Bill Yi
84540eb406
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c13633d1d0 -s ours am: fa94aa39eb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379996
Change-Id: I1db167d83ab5b7ca8f48238b54dbeb003d7754fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:29:36 +00:00
Bill Yi
da3133ac63
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -s ours am: 7e4689c960 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379996
Change-Id: I69b909d9069c977791f7446d6095185da0e107ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:29:21 +00:00
Bill Yi
ad0d23056a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -s ours am: c5bca3f94f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379722
Change-Id: I0b88395c41ad4ce3035163c3903cee8b2d2bd227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:29:14 +00:00
Bill Yi
7c4360c9dc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -s ours am: dc957a0cae -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379722
Change-Id: I5b85e9cf9657101ccf88de259d0635f134818690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:28:55 +00:00
Bill Yi
ae1eb664b7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -s ours am: 2833f69afa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379718
Change-Id: I2b93e06430597017960a041466e1863ffd79a8dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:28:29 +00:00
Bill Yi
98d36bda87
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384 -s ours am: 59aaf2dd32 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379718
Change-Id: Ie71760a2a06edb3bf47b6794f7528e388cf547d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 00:28:06 +00:00
