Commit Graph

105606 Commits

Author SHA1 Message Date
Victor Chang
200c45a9fe Merge "Reland "Don't use framework strings for formatting file sizes"" am: ba69fd0d3f am: d5ab7dc729 am: 5aada33242 am: 330934cfb5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2096605

Change-Id: I51f6f771dd9a791c3dcc5465bff9e426d649f5ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 11:38:30 +00:00
Victor Chang
330934cfb5 Merge "Reland "Don't use framework strings for formatting file sizes"" am: ba69fd0d3f am: d5ab7dc729 am: 5aada33242
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2096605

Change-Id: I7208109922af4f7e2bf7aa67e4ee599164eff16c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 11:29:37 +00:00
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
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
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
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
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
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
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
Bill Yi
410d895879 [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: I82befbbb0ca1534c2fd0c892c892592358113773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 00:59:05 +00:00
TreeHugger Robot
0a367dea1d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-24 00:38:21 +00:00
Automerger Merge Worker
a84dc1a814 Merge changes from topic "am-14fdde8e45c44bc8aa7d94ffcc435b82" into tm-d1-dev-plus-aosp am: 71ab33b3b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099

Change-Id: I4563aa81f4099798237f8a0c0b38ceb68d61bdac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:15:01 +00:00
TreeHugger Robot
1838a88c75 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab -s ours am: 5fdd0b386f -s ours am: c484ac981e -s ours am: 91d1f44c86 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099

Change-Id: I5ccd2be2f5a23f5bdfbb8ae38764f84cd813fe33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:14:46 +00:00
Automerger Merge Worker
540c46a3fe Merge changes from topic "am-3b53c87eb8b44708872c3bea0a97e04d" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab -s ours am: 5fdd0b386f -s ours am: d8e9a267cf -s ours am: ad5f87709b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71 -s ours am: 6db82b3062 -s ours am: ea5907aeae -s ours am: 962ef907c1 -s ours
2022-05-23 20:12:46 +00:00
TreeHugger Robot
7b8ebb1f94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab -s ours am: 5fdd0b386f -s ours am: d8e9a267cf -s ours am: 3c902f3518 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099

Change-Id: I9951fa23d64b0700e5e103d83b29370c154fd1b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:11:43 +00:00
TreeHugger Robot
0f6fda601e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab -s ours am: 5fdd0b386f -s ours am: d8e9a267cf -s ours am: ad5f87709b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099

Change-Id: Ic017e02851e5343bbad8651bb290aa11fb65bf45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:11:43 +00:00
Bill Yi
2c4d65b13a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71 -s ours am: 6db82b3062 -s ours am: ea5907aeae -s ours am: 7b032170cc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099

Change-Id: I97124597998295713071aef89c5a397d24395e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:11:27 +00:00
Bill Yi
e418f446cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71 -s ours am: 6db82b3062 -s ours am: ea5907aeae -s ours am: 962ef907c1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099

Change-Id: I6cf1c0dd1d20a048a554b901e8b4e5d6a169ffeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:11:26 +00:00
Bill Yi
123aaf71fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b -s ours am: d28e552f18 -s ours am: 2cc27bc744 -s ours am: aae3efd3a7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520141

Change-Id: I98a36d0194ac2b0f21a2555db3ee7c1a4bb97bcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:09:57 +00:00
Bill Yi
c88234414d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b -s ours am: d28e552f18 -s ours am: 74bb796c67 -s ours am: b8a8d5b643 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520141

Change-Id: Ia38f908ed9882c99557db8959b22cc44fc2f34a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:09:05 +00:00