Victor Chang
5aada33242
Merge "Reland "Don't use framework strings for formatting file sizes"" am: ba69fd0d3f
am: d5ab7dc729
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2096605
Change-Id: I8b616af8d02a6d984d7dbec2b50087242958dd40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 11:20:54 +00:00
Binyi Wu
3a49fae347
Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250
am: 2331e4b511
am: a11ef13497
am: cdbcb31c58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457
Change-Id: Ie30ec470239bea0acde5adc8949c16345ef2bd48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 11:20:41 +00:00
Victor Chang
d5ab7dc729
Merge "Reland "Don't use framework strings for formatting file sizes"" am: ba69fd0d3f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2096605
Change-Id: Ib0ad04ef4c225fbc449abed9913381d6c8d3a138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 10:53:20 +00:00
Binyi Wu
c602a9e36a
Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250
am: 2331e4b511
am: 311e40ce4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457
Change-Id: I84cfeeaf0f47d3449e86c885d97b9d1b9d1a8641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 10:53:03 +00:00
Binyi Wu
e296e407f0
Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250
am: 3ea7d18309
am: 7c5f75c221
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457
Change-Id: I816b2269c90d835a984654c4b6f088c20b6a9ce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 10:52:40 +00:00
Binyi Wu
cdbcb31c58
Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250
am: 2331e4b511
am: a11ef13497
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457
Change-Id: I4e8f7f008a9dca0386e820f4d01116b703ae58e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 10:52:17 +00:00
Hugh Chen
75b75d446c
Make VPN by Google One always appear in VPN settings
...
Bug: 233559781
Test: manually test
Change-Id: I175ab126ff92f773ab25a1fa64e4262b324fd353
2022-05-24 10:09:19 +00:00
Victor Chang
ba69fd0d3f
Merge "Reland "Don't use framework strings for formatting file sizes""
2022-05-24 10:04:46 +00:00
Binyi Wu
311e40ce4b
Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250
am: 2331e4b511
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457
Change-Id: I50ed51405f483c4072aa20a72208ca06be119ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 09:44:32 +00:00
Binyi Wu
a11ef13497
Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250
am: 2331e4b511
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457
Change-Id: I2a4608ab2f02f46f700dd3d72843ac301eb096dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 09:44:09 +00:00
Binyi Wu
7c5f75c221
Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250
am: 3ea7d18309
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457
Change-Id: I6e8a23ab2074f976b646ac46cefee5e8fd725fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 09:44:08 +00:00
Binyi Wu
2331e4b511
Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457
Change-Id: I513978e2c436055ac1269fd4795d11c48b0ddef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 09:17:12 +00:00
Binyi Wu
3ea7d18309
Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457
Change-Id: Ice082991ab8157716aa910ee15ad2c7fa8096086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 09:15:28 +00:00
Binyi Wu
8fd6873250
Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev
2022-05-24 08:32:03 +00:00
Arc Wang
03d8d11914
Fix can't start injected item problem
...
Should set highlight Preference key after
isDuplicateClick to ensure clicked Preference
key & highlight Preference are different and
then isDuplicateClick returns a correct value.
Bug: 233553587
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.dashboard
manual
1. Click all left pane items and see if there is any launch problem.
2. Check if duplicate click check works.
Change-Id: Ic6394b96896fd3a0fb926707565f63beff74a27b
2022-05-24 07:13:35 +00:00
TreeHugger Robot
dcb2519a65
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc
am: 62050f266a
am: c468b7f873
am: d7ad3680d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664
Change-Id: I670394d37a71fdfb7cfe10bafdcb5ef507574e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 06:32:26 +00:00
TreeHugger Robot
f33d42bcbe
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc
am: 9ba22d2ec9
am: cff52e6aa4
am: f3f5bc2ff7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664
Change-Id: I1a3455a6ad74686a2a0aa2b5be42d364f19b762b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 06:23:21 +00:00
TreeHugger Robot
a69c622dbe
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc
am: 9ba22d2ec9
am: eb9df278da
am: ad7057c70b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664
Change-Id: Ifffed5848e96d5aa05a7e8d948f45fe202830af1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 06:13:23 +00:00
TreeHugger Robot
d7ad3680d8
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc
am: 62050f266a
am: c468b7f873
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664
Change-Id: Ifc0c7afdfff397e9cdaa72a3c9088227e016642d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 05:34:21 +00:00
TreeHugger Robot
f3f5bc2ff7
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc
am: 9ba22d2ec9
am: cff52e6aa4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664
Change-Id: I90071c1acaac0adbc0349f3c360a0fa3116627fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 05:33:21 +00:00
TreeHugger Robot
ad7057c70b
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc
am: 9ba22d2ec9
am: eb9df278da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664
Change-Id: Idb1a3ca83695f791858d5974e4b5425f5ff39f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 05:33:14 +00:00
TreeHugger Robot
702b95ab0b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d
-s ours am: 17093f454c
-s ours am: 020ac9fb19
-s ours am: eedd139230
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: Ic32a96f3aa0f94a5c3a9983372b6aa61466d33b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 05:27:31 +00:00
Bill Yi
7637402552
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302
-s ours am: 410d895879
-s ours am: fd2febf4bc
-s ours am: e97b5b2f68
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: Ia41da2d8e0e394a2d999131680ddf439d163f400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 05:27:17 +00:00
TreeHugger Robot
cff52e6aa4
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc
am: 9ba22d2ec9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664
Change-Id: Ia63e588d30bc5d67989d60d7daa272ecc12faacb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 05:14:27 +00:00
TreeHugger Robot
c468b7f873
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc
am: 62050f266a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664
Change-Id: I9582436cffe9ddfc18e2b803e79262effe0192bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 05:14:11 +00:00
TreeHugger Robot
eb9df278da
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc
am: 9ba22d2ec9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664
Change-Id: I3498483e5e73d28151b5ac151ca05b2f375f9333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 05:14:06 +00:00
TreeHugger Robot
4714e781dd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d
-s ours am: 56c0920c7c
-s ours am: 9f3f3f02de
-s ours am: d0dc7a0645
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I14fce986a33bf48a7f07144c45aec1cb6d6c9eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 05:09:07 +00:00
Bill Yi
116980742b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302
-s ours am: 6adb47ebfa
-s ours am: 19befc3edc
-s ours am: 6fa5dd70e9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: Iabb8456cd74345259e42e33f1289cd1c4a564f17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 05:08:51 +00:00
Edgar Wang
2b0d9cfc5d
Fix talkback speak "double tap to activate" on LabeledSeekBarPreference
...
- SeekBarPreference should be unselectable
- remove unnecessary handling of Summary
- set currect Title color when preference is enabled and unselectable
Bug: 230553896
Test: robotest
Change-Id: Ie5d819088dc3c435005ddd00e232b2f6992b234a
2022-05-24 05:08:16 +00:00
Binyi Wu
26e5e919c8
Prevent keyboard from blocking the input box for WiFi configuration page.
...
Bug: 223980567
Test: manual
Change-Id: I2b95b065394e2395396ff71b00bd949ac824dac3
2022-05-24 12:50:41 +08:00
TreeHugger Robot
9ba22d2ec9
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664
Change-Id: I05b01fbce6e6e1dc51cd5bdad2d9fdd0a80bb068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 04:42:47 +00:00
TreeHugger Robot
62050f266a
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664
Change-Id: I062ee27af956efba4246b377f797bf11df9b43de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 04:42:12 +00:00
TreeHugger Robot
1105c0fa52
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d
-s ours am: 56c0920c7c
-s ours am: 32b6f4d04a
-s ours am: 92691db2bc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I046b3730d5478077c182cc4c9afde83d0e58ba0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 04:31:47 +00:00
Bill Yi
3289f2a326
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302
-s ours am: 6adb47ebfa
-s ours am: 012a641355
-s ours am: f9f881f5af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: Ie8a5d5a31b346baae5bced0e54c8f60b254d0474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 04:31:29 +00:00
TreeHugger Robot
eedd139230
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d
-s ours am: 17093f454c
-s ours am: 020ac9fb19
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I3203a517b7a03814ead09679ede88375cfa79f99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 04:15:42 +00:00
Bill Yi
e97b5b2f68
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302
-s ours am: 410d895879
-s ours am: fd2febf4bc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I6899a8d5e94a45573fbe2efe406e98a4e78e4c16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 04:15:25 +00:00
TreeHugger Robot
020ac9fb19
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d
-s ours am: 17093f454c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I09d9455cc2b417845eac29b6e453c6f220618a99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 04:04:55 +00:00
Bill Yi
fd2febf4bc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302
-s ours am: 410d895879
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: Ida8ee47cf088bb8f90ef77e766757f562e9084dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 04:04:41 +00:00
TreeHugger Robot
d0dc7a0645
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d
-s ours am: 56c0920c7c
-s ours am: 9f3f3f02de
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: Ie47b071fcff9c0bb1198ef7855a17c91e9c09b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 03:59:29 +00:00
Bill Yi
6fa5dd70e9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302
-s ours am: 6adb47ebfa
-s ours am: 19befc3edc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I8f15fd14ad819780f610534b2de4c79f242d9f73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 03:59:12 +00:00
TreeHugger Robot
d9174aa3cc
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev
2022-05-24 03:51:23 +00:00
TreeHugger Robot
92691db2bc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d
-s ours am: 56c0920c7c
-s ours am: 32b6f4d04a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I58fa8d91b902eae0110f4681bbe4c56154c91a35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 01:43:15 +00:00
Bill Yi
f9f881f5af
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302
-s ours am: 6adb47ebfa
-s ours am: 012a641355
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: If359bda371fe523470e28c94463b7a596b4aaf39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 01:43:00 +00:00
TreeHugger Robot
32b6f4d04a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d
-s ours am: 56c0920c7c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I17da409229164eefaa12b2dace1803feb2403859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 01:23:24 +00:00
TreeHugger Robot
9f3f3f02de
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d
-s ours am: 56c0920c7c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I652cde4bc91c09d8e4809bf472dc29e384ea9068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 01:23:23 +00:00
Bill Yi
012a641355
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302
-s ours am: 6adb47ebfa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I33c2e7c1b3ef8eebf11ec51b513bff3254d266d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 01:23:10 +00:00
Bill Yi
19befc3edc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302
-s ours am: 6adb47ebfa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I302679597b5d000936ea7f797441f27b480f02cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 01:23:06 +00:00
TreeHugger Robot
56c0920c7c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I037cb6676fd41cb985c7bffcb0bb17535a7270b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 01:00:08 +00:00
Bill Yi
6adb47ebfa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I989eaca89d3cb7666d68d5ce2f889fcbdc6ab316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 00:59:56 +00:00
TreeHugger Robot
17093f454c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: Ibbf5b2d45f16c91642b1365e806c94224150a421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 00:59:22 +00:00