PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,887 Commits 1 Branch 0 Tags
17910cdfa77129dde8fb4c3cb1563b192b2870db
Commit Graph

102887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
337cfe6fc0 Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev 2022-05-03 07:54:30 +00:00
Betty Chang
b1fa93e7ef Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886

Change-Id: Ifde61888817130fd5902812a1230ba07f732c670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 07:34:14 +00:00
Edgar Wang
22f7ab59c0 Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962

Change-Id: I21dc53385d41f1bfc5db2e11535b11902434d3e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 07:34:07 +00:00
Bonian Chen
eff476375c [Settings] Fix missing part for refactor 
There're 2 missing parts in previous code refactor:
1. The API change for exiting ECM mode dialog
2. The support of onActivityResult() for PreferenceController

Bug: 226494641
Test: local
Change-Id: I0c2c313a53fbc1b7435f295f190b70653e2f6758
 2022-05-03 07:33:48 +00:00
Betty Chang
e076e599b5 Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886

Change-Id: I87abeb4a2d67f78a1cc9313a0c82b5f3cd4e82f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 07:33:00 +00:00
Edgar Wang
585552149e Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962

Change-Id: I273f03d6a2221dd937f382b1cd8a2aec7fcaa0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 07:32:43 +00:00
Betty Chang
5dea2176a2 Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev 2022-05-03 07:21:11 +00:00
Edgar Wang
37ad451324 Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev 2022-05-03 07:14:24 +00:00
Weng Su
e37a553e94 Show restricted message in Wi-Fi hotspot settings 
- Remove Wi-Fi hotspot preferences in settings search if Wi-Fi hotspot is disallowed

- See the result screenshot in b/203168953#comment12

Bug: 203168953
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Change-Id: Id4416fd0659b596e4e6f31890a139198219f4552
 2022-05-03 13:58:54 +08:00
changbetty
f31b5769d7 [LE] Launch the dialog for the user to broadcast or find broadcast 
- Launch the broadcast dialog from entry point in Media Volume Slice

    - Fix the broadcast dialog to follow the dialog style

    - Start broadcast and launch the MediaOutputBroadcastDialog from
      broadcast dialog

Bug: 229577518
Test: manual test
Change-Id: I1329b3f35b03afc441142494df883ae17f373656
 2022-05-03 03:16:08 +00:00
Bill Yi
23be7b9db3 [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: 44a2ff89cf -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: If7e2ae9d51d2f6db6b24b00c7ceeb592dbb423ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 02:23:25 +00:00
Bill Yi
b47701d110 [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 skip reason: subject contains skip directive

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

Change-Id: I7418afc8372393f6d9011f4ad36b7ca4b6cd5c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 02:23:11 +00:00
Bill Yi
3ad5a7ee3f [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 skip reason: subject contains skip directive

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

Change-Id: Ia7809414739e615243ee8d084153167475d8bb11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 02:22:49 +00:00
Bill Yi
179a379817 [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: 75bc75a29f -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: I2be1d78a47e7a111126e6ff1465b2ef480867a7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 02:22:30 +00:00
Bill Yi
2e250b15ae [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 skip reason: subject contains skip directive

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

Change-Id: Ic3383b1b6dd4f16681cce223ee65c2fe803d7c68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:33:43 +00:00
Bill Yi
4cef0633cc [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 skip reason: subject contains skip directive

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

Change-Id: I83ae602441499355b7e2f4983d04edd5ef1b5090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:33:26 +00:00
Bill Yi
44a2ff89cf [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 skip reason: subject contains skip directive

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

Change-Id: Iec8b3cf4d0eb95ec49cca213dd8b79d615f7c613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:32:30 +00:00
Bill Yi
75bc75a29f [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 skip reason: subject contains skip directive

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

Change-Id: I32e5e51e5a8201a26fcf160d51e8fe732cf8a41e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:32:22 +00:00
Bill Yi
a82a1ff84e [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 skip reason: subject contains skip directive

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

Change-Id: I76e5a942e34ed88eb8bccc0651f3faf2d7536922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:31:51 +00:00
Bill Yi
f97cfa7745 [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: f5c29cfb3f -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: Ib001317d8b2161e016b7e1717535617c9d00105e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:01:06 +00:00
Automerger Merge Worker
d5c1675c8d Merge "[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" into tm-d1-dev-plus-aosp 2022-05-03 00:00:58 +00:00
Automerger Merge Worker
11f8d65f89 Merge "[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: 99e94c9e83 -s ours" into tm-d1-dev-plus-aosp 2022-05-03 00:00:56 +00:00
Bill Yi
9bbc6179fa [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 skip reason: subject contains skip directive

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

Change-Id: Ife95013b727054ca050ea67a3f584c82639d4ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:00:56 +00:00
Bill Yi
179dc368a5 [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: 99e94c9e83 -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: I81b4167a21ed5b66bc78e7aa3712e5f31164bd8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:00:50 +00:00
Bill Yi
41b6a6c820 [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 skip reason: subject contains skip directive

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

Change-Id: Id66275160d51b92ccd9285f85143bc699b375a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:00:48 +00:00
Bill Yi
98ba0fcdb2 [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 skip reason: subject contains skip directive

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

Change-Id: I553b53171f9a0a2a687ed2818458e0b392e04463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:00:48 +00:00
Bill Yi
10abd90819 [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 skip reason: subject contains skip directive

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

Change-Id: Ia097d604caed1a90740d24c5dbe05807242127ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:00:46 +00:00
Bill Yi
5568a2692b [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 skip reason: subject contains skip directive

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

Change-Id: I1792e2b768d4f82fe0445f19f8507b7b90e10cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:29:34 +00:00
Bill Yi
ec8ffc26f0 [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 skip reason: subject contains skip directive

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

Change-Id: I42861a9403188b0614ebdfd636539fa26674d401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:29:29 +00:00
Bill Yi
551016f43b [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 skip reason: subject contains skip directive

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

Change-Id: I5cea3e375757e71dc4f940d0e02aaa6425cc8136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:29:26 +00:00
Bill Yi
b8d61f99e0 [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 skip reason: subject contains skip directive

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

Change-Id: I8e84a4ec5b0aa8c75372ac26088a3b4da51dfef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:28:29 +00:00
Bill Yi
f5c29cfb3f [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 skip reason: subject contains skip directive

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

Change-Id: Ieed0397312142966859dbc1f9cae0aeb72936afe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:28:18 +00:00
Bill Yi
99e94c9e83 [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 skip reason: subject contains skip directive

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

Change-Id: I9e228eecc7f7a7aa59645e80f75b021df007e3df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:28:08 +00:00
Bill Yi
492bf8306b [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 skip reason: subject contains skip directive

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

Change-Id: I35401ea88c1ab125a3be2df7f6ad908d038df82e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:55:50 +00:00
Bill Yi
5356ad8386 [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: 974687937a -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: I2045f7a7d36509d9036580c0bf6688f1b0f687aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:55:42 +00:00
Automerger Merge Worker
625c8fc3bf Merge "[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" into tm-d1-dev-plus-aosp 2022-05-02 22:55:39 +00:00
Bill Yi
cde959f3a6 [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 skip reason: subject contains skip directive

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

Change-Id: Ib4cccd71e8991878b46e1b713de364084104adb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:55:36 +00:00
Bill Yi
c3f03dc85d [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: d90b520987 -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: Iba6be547b6c5a8ab71c5093a2c7b752818f9717b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:55:35 +00:00
Automerger Merge Worker
1a0002b8fd Merge changes from topic "am-c96afa0d048c4d6f8d1121d9e6343e97" into tm-d1-dev-plus-aosp 
* changes:
  [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
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours am: 1a4297414e -s ours am: c0bf62368b -s ours
 2022-05-02 22:55:33 +00:00
TreeHugger Robot
f94ed39c6e [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 skip reason: subject contains skip directive

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

Change-Id: I20a0da93e91052e3c33146c39eed3a5aa446f395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:55:29 +00:00
TreeHugger Robot
a0bc08526b [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: 23d0c812a8 -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: I64305bc4ddaaf8d9bbc5de87a00cdb0c8d92ce36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:55:28 +00:00
Bill Yi
bc12b50bb6 [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 skip reason: subject contains skip directive

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

Change-Id: Ib76d0c11fcf82e9f8314fbe0f906598eaa4f53b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:55:27 +00:00
Bill Yi
e20d703c1c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours am: 1a4297414e -s ours am: f25a5f3d8d -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: I1591f97c5014cb7fe83ebaa27139ba5576cd2388
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:55:27 +00:00
Bill Yi
53a2c241a6 [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 skip reason: subject contains skip directive

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

Change-Id: I257ae9c7f8860d91b63ee8836424ddea08a1c98a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:55:14 +00:00
Bill Yi
f1a62d5431 [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: 59b8a120d0 -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: I6bce3da51b11e677d3cf1cc631d0fb352e09e1dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:54:46 +00:00
Bill Yi
a8f28ed7c5 [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 skip reason: subject contains skip directive

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

Change-Id: Ib411051ca0e3f2d2b849688bce481a663a44fadb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:53:37 +00:00
Bill Yi
ec31d2697d [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 skip reason: subject contains skip directive

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

Change-Id: Ibab132c360957a95e11a84dd1f7b88cc178a1381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:53:28 +00:00
Bill Yi
9f888216b4 [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 skip reason: subject contains skip directive

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

Change-Id: I0b27088d1c07bfaf369d2da9689e2c10eb3c4eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:53:21 +00:00
Bill Yi
974687937a [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 skip reason: subject contains skip directive

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

Change-Id: Ief0104f16842bc80e1b6f1d22ea02a446da1dcc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:37:33 +00:00
Bill Yi
d90b520987 [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 skip reason: subject contains skip directive

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

Change-Id: Ie8d43f11644329b74b8d69fae17fe1b14e38fac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:37:22 +00:00