Commit Graph

105400 Commits

Author SHA1 Message Date
Bill Yi
2b554b0dbb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8460461f4d -s ours am: a3fdaece70 -s ours am: f385713f6b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9292e164bddeed437c618067c00563c2c743fb33
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 20:50:22 +00:00
TreeHugger Robot
39143b0b93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7a6e5d0b0b -s ours am: 8c759d6469 -s ours am: ad9bfbffaf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I21ca5abea8fcc7b22951ffef2f928fede621a5d8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 20:50:03 +00:00
Bill Yi
6a5c064925 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e411e93e7 -s ours am: 5fb0418563 -s ours am: 55211b61d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79c7cbfb2bb03965077db22ba5c0af609d47f34a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 20:49:46 +00:00
TreeHugger Robot
d3cba01021 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3624b9a2ef -s ours am: 32f8460aac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I35d560b1756ac96068c60a26689393683901dceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 20:10:35 +00:00
Bill Yi
f385713f6b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8460461f4d -s ours am: a3fdaece70 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I177958553a72fc56d2eab5da68d4b2e383dbe03e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 20:10:06 +00:00
TreeHugger Robot
ad9bfbffaf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7a6e5d0b0b -s ours am: 8c759d6469 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2a0e05b77836f0b6927c841c3f7104ef8150c943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 20:09:42 +00:00
Bill Yi
55211b61d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e411e93e7 -s ours am: 5fb0418563 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3c97ae3cc9810284905954ab68a5f6072b81625d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 20:09:20 +00:00
TreeHugger Robot
1de2f7a557 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3624b9a2ef -s ours am: c2a243d18e -s ours am: 53c6bea932 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icb108d270e7a9cc5332cc4e920ab62fd5e7eee96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 20:01:36 +00:00
Bill Yi
9de0d65337 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8460461f4d -s ours am: a677c158cb -s ours am: ffdb2b7614 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic628c812a3c444a6f898515eef7faba8c3d209e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 20:00:59 +00:00
TreeHugger Robot
d9802bbdb6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7a6e5d0b0b -s ours am: 5cbf83555b -s ours am: 2501bf61be -s ours
am skip reason: subject contains skip directive

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

Change-Id: I998932bf6f48d19335d1a98c1ea3cfcf3e3fcba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 20:00:40 +00:00
Bill Yi
ddb2717884 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e411e93e7 -s ours am: 4b425d20e9 -s ours am: ba0eb24634 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9b12a1c9a50e613c6dd2e50ac2a5c209cc35f7d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 20:00:25 +00:00
TreeHugger Robot
32f8460aac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3624b9a2ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I363d10e518483394ead5bcc4bf6e7f35f663f434
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:44:36 +00:00
Bill Yi
a3fdaece70 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8460461f4d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5ad6e33af4bad2d9a9d4d006b21d4f6e005b2f21
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:44:08 +00:00
TreeHugger Robot
8c759d6469 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7a6e5d0b0b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2433ce74a331e7114970e3014cf54ffab3385cdc
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:43:46 +00:00
Bill Yi
5fb0418563 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e411e93e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e13760430a92441037a847f37ae9d0cd1945942
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:43:26 +00:00
TreeHugger Robot
53c6bea932 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3624b9a2ef -s ours am: c2a243d18e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3aaa24f8888a57a29c3b2e24fca71e78c2120bcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:32:13 +00:00
Bill Yi
ffdb2b7614 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8460461f4d -s ours am: a677c158cb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I658d9e5fa7772e7e7d24f395b5ac78aa12ae4601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:31:40 +00:00
TreeHugger Robot
2501bf61be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7a6e5d0b0b -s ours am: 5cbf83555b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I432a12d19f8d5062ac5e31a2a1632edda108e4ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:31:19 +00:00
Bill Yi
ba0eb24634 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e411e93e7 -s ours am: 4b425d20e9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f76fb8d8a431541c4570c6b3fe2f6b6ab630151
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:31:01 +00:00
TreeHugger Robot
c2a243d18e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3624b9a2ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I99d292630bcfbd5889c08c643fc86668af23c2c0
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:21:01 +00:00
Bill Yi
a677c158cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8460461f4d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55f07f8d0ba4b3266573f76b7b96384248566626
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:20:34 +00:00
TreeHugger Robot
5cbf83555b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7a6e5d0b0b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79d31ce9d982d951446f2cb5fb3fdf99e493105c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:20:11 +00:00
Bill Yi
4b425d20e9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e411e93e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie5f16a932cfe36d923f82a9d582eef544e490a71
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:19:50 +00:00
TreeHugger Robot
3624b9a2ef Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-22 18:56:18 +00:00
TreeHugger Robot
7a6e5d0b0b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-22 18:56:18 +00:00
Ricky Wai
8371aadccb Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: 8f61acd8c2 am: cbeee15903 am: 6495fbd287
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: Ie7b42f09206fab9aa2838502bac1278b46cff312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 16:07:47 +00:00
Ricky Wai
e07603cb0e Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: 8f61acd8c2 am: f3ed6ffb04 am: 6dcd03fa4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: Iddde321f1945f7ab2994739437aa69664f1d5f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 16:05:55 +00:00
Ricky Wai
ca190ec8ab Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: e2edfe3235 am: 1a574d518b am: ca6662d2cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I585d5a29b62a0e90bee5f4e616f3199906d8fcf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 16:03:34 +00:00
Ricky Wai
6495fbd287 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: 8f61acd8c2 am: cbeee15903
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I3cfc1e988490ccbf18884c564e710231d438c617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 16:01:08 +00:00
Ricky Wai
6dcd03fa4c Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: 8f61acd8c2 am: f3ed6ffb04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I9a81012b7635696bb26d7d972498dfac04547795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:51:22 +00:00
Ricky Wai
f3ed6ffb04 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: 8f61acd8c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I63d21313f123db06ce3c70e8e2bfb8429f3e531e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:45:10 +00:00
Ricky Wai
cbeee15903 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: 8f61acd8c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: Ic8af009c1dd59d59d45139379c2d66c4d8992baf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:44:59 +00:00
Ricky Wai
8886c7cc83 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: 3ab907b968
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I9a995000d3a7b44bd3de1f48363949c0d45191fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:44:37 +00:00
Ricky Wai
ca6662d2cd Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: e2edfe3235 am: 1a574d518b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I5d85d8481ce0e4de843569c5f768e645674c401a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:44:21 +00:00
Ricky Wai
1a574d518b Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: e2edfe3235
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I71ce8388f0b3bba551896b8869e445f095b53eb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:19:35 +00:00
Ricky Wai
8f61acd8c2 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I8342a30b9e86699fcce7f8f5858572def92c30ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:18:58 +00:00
Ricky Wai
3ab907b968 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I6a88065f868d567bd7771a8e44ac65e23ee12999
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:18:19 +00:00
Ricky Wai
e2edfe3235 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: Ic4f104b59e2fceb3e8d949bb8c6402abd51c2a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:17:55 +00:00
Ricky Wai
fd7153ed39 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev 2022-04-22 14:53:00 +00:00
SongFerngWang
b76feffe4f Gray out the network mode UI before the carrier config is ready
Bug: 202167671
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: Ib502ac19ea2c19dae95025302dd82aa2b1c7ff88
2022-04-22 19:28:13 +08:00
Automerger Merge Worker
a95ee31cc8 Merge changes from topic "am-0af370f6b33542b09d673716bbc90c20" into tm-d1-dev-plus-aosp am: aa2ed50e34 am: 7f0846af30
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024

Change-Id: I43a7b5b312eabc0f16e852f8ee667dbd7b45fdef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 11:02:23 +00:00
TreeHugger Robot
8beaf42f4e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25 -s ours am: 7d5cc42c81 -s ours am: 5c7d0155a8 -s ours am: 69acf57ed4 -s ours am: 95a6f1aa40 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I50f1dce5aea82e67f563aa3216f697d5264cd070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 11:02:07 +00:00
TreeHugger Robot
d46dc7fa96 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25 -s ours am: 7d5cc42c81 -s ours am: 46f1b16545 -s ours am: 45f2cc4a18 -s ours am: 1d417eb96e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8aea0181ae6bf3663ad175182e8088dfab8b29b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 10:57:02 +00:00
Bill Yi
62ecdc7d50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours am: f1b797ac9b -s ours am: 2affff9747 -s ours am: 8e7b0e6168 -s ours am: a430d7f7be -s ours
am skip reason: subject contains skip directive

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

Change-Id: I19d2e1c6401bbe24a4641bfbdbd023001837c7ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 10:56:47 +00:00
Automerger Merge Worker
8cc8180525 Merge changes from topic "am-fe6796979262402b94fadb527ca58a6b"
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372 -s ours am: 896ea5769a -s ours am: 2fbc122a96 -s ours am: 4ad33b98b0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3 -s ours am: de73de0c47 -s ours am: c55eab5de8 -s ours am: 2ba264fd2d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1 -s ours am: 9ea6d0e609 -s ours am: 8a9c502802 -s ours am: 6ae63e0465 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f -s ours am: 8c88568430 -s ours am: 4061677234 -s ours am: 0e6d307c19 -s ours
2022-04-22 10:51:13 +00:00
Bonian Chen
2615ee4097 Merge "[Settings] Code refactor for monitoring service state" 2022-04-22 10:50:47 +00:00
Bill Yi
e69a9f398e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372 -s ours am: 896ea5769a -s ours am: 2fbc122a96 -s ours am: 4ad33b98b0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaa5a50cee583be001417c8365653bf0cad1d6138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 10:50:34 +00:00
Bill Yi
2d30a08fc1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3 -s ours am: de73de0c47 -s ours am: c55eab5de8 -s ours am: 2ba264fd2d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3f8dff644a3b9f09bb22a8adbfff5640b2c1094f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 10:50:08 +00:00
Bill Yi
59855ab46d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1 -s ours am: 9ea6d0e609 -s ours am: 8a9c502802 -s ours am: 6ae63e0465 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I97a6825d0ac2fc1833ce3a2d3c7403a6486252ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 10:49:48 +00:00
Bill Yi
cc6d650159 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f -s ours am: 8c88568430 -s ours am: 4061677234 -s ours am: 0e6d307c19 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ica574e6e85831ff75f407fd8b3bc6e0598dd11f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 10:49:33 +00:00