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: bfd3ced372896ea5769a2fbc122a964ad33b98b0e14416d5a3de73de0c47c55eab5de82ba264fd2d3ec36ec5c19ea6d0e6098a9c5028026ae63e04651f7be3a07f8c8856843040616772340e6d307c19
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
TreeHugger Robot
bf4946130b
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3 am: 21a233b016 am: ac7f4cf8c5 am: 5422c75c63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346
Change-Id: I69aeee03f59e2e6df8a9887bf6a16f67a5066b65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 10:47:14 +00:00
Bill Yi
fdb5baa684
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372 -s ours am: 430feee676 -s ours am: 297c6c02a8 -s ours am: ad66cb353a -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: Ifaf6ac167ea9d358b3b0ff93ec788a3076730a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 10:41:08 +00:00
Bill Yi
f9a40a17bc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3 -s ours am: a4dc078791 -s ours am: f9cd80a484 -s ours am: 6312eaade6 -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: I9cbd5a7697b0a97054bc531d52b78e83518a38aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 10:40:44 +00:00
Bill Yi
a1fc2a2fe6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1 -s ours am: 304ef2074f -s ours am: e6e9f5cf87 -s ours am: 7866a63876 -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: I6d17b7f8edc4a35c5b9c7727160f2706cfa557fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 10:40:22 +00:00
Bill Yi
e1f7b50cf8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f -s ours am: 4a4c5fd413 -s ours am: a1be6fe405 -s ours am: cfa7dd6ec6 -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: I1577539587805f92958e37c6c600c640eeb2790f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 10:40:02 +00:00
Bonian Chen
aeac0619df
[Settings] Code refactor for combining TelephonyCallback with Lifecycle
...
This is a helper class which may support monitoring the
TelephonyCallback under the condition of Lifecycle state STARTED or
RESUMED.
Bug: 229689535
Test: unit test
Change-Id: I6d26bee604d9559e207e107b2f26583f700f8e0a
(cherry picked from commit 7c5259efad
2022-04-22 10:39:04 +00:00
Automerger Merge Worker
95f5ba272a
Merge changes from topic "am-0e7676448c5b4e55bb221cb7ed291f45" into tm-qpr-dev-plus-aosp am: 7752b9dacd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: I1905ace430c8c817d6c55652015d1d19398e3375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 10:33:08 +00:00
TreeHugger Robot
1dea853075
[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: 5df4451e95 -s ours am: 7ff9620b02 -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: I2ce246ddbb5c7b79be09028469bec61837a42fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 10:32:53 +00:00
TreeHugger Robot
5e365bbb2f
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3 am: fb74f218a9 am: 56c72e3ede am: ab5c598b54
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346
Change-Id: Ia5d1a223ac0561a83cc939edf68a192b334216e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 10:27:10 +00:00
Bill Yi
89658fb077
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372 -s ours am: 430feee676 -s ours am: f9c1494ac4 -s ours am: b368c300d7 -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: I90b7ffcb2189c9838a0a2a2b4ff037dbd18a258a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:57:35 +00:00
Bill Yi
7b23b6beaa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3 -s ours am: a4dc078791 -s ours am: f9278c4321 -s ours am: 2ff83e93ff -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: I83c250a9467583bdaaa890fd6e3aae8b98651fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:57:14 +00:00
Bill Yi
0320e502da
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1 -s ours am: 304ef2074f -s ours am: 7af6389b57 -s ours am: d1fe167bc1 -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: Idf43175c7e1e69180e637d00efdea9ff91fa62c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:56:52 +00:00
Bill Yi
5558a2a086
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f -s ours am: 4a4c5fd413 -s ours am: 9d7c1d4926 -s ours am: 8be794f18d -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: I0cb2c5611f1a9e3921b20ba5ed2620f0f4b5aea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:56:30 +00:00
TreeHugger Robot
2ae2fbf05f
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3 am: fb74f218a9 am: 172e1f5958 am: 94444b8319
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346
Change-Id: I3bc6da36f45dd54ff89d2f3b8a7203a11ec794d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:54:13 +00:00
Chaohui Wang
94816f56de
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff am: 1dd8117b21 am: 921f561964 am: f94aedc6a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758
Change-Id: Ic2207756b38ce9cc9d310ceefe92f4d378af5beb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:54:06 +00:00
Stanley Wang
1dcaa199bf
Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88 am: 1f2337d627 am: 8d3cf3efba am: d883e54c6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356
Change-Id: I747382b12cf4b9cc02c5576b09c01da433d4c8b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:53:59 +00:00
Chaohui Wang
07f59e7e3c
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff am: 956f0a8cc2 am: 148b586d1a am: f1848c19f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758
Change-Id: Ifab38090eef5a02b07f89128013bc352e9a7b813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:53:52 +00:00
Stanley Wang
b140907ac9
Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88 am: 18206def81 am: c57825f409 am: baf930a104
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356
Change-Id: I06e6b9494995e754ecc43e6804e7268015df7ba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:53:45 +00:00
Chaohui Wang
c6ddbcd753
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff am: 956f0a8cc2 am: e6adea223c am: 62702c7c6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758
Change-Id: I4244a58c56e352aab999582d91941d11585dc2a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:53:37 +00:00
Automerger Merge Worker
7f0846af30
Merge changes from topic "am-0af370f6b33542b09d673716bbc90c20" into tm-d1-dev-plus-aosp am: aa2ed50e34
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: I2a94518c6d788fa0dc318c440da6f1039e860e24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:43:50 +00:00
TreeHugger Robot
95a6f1aa40
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: Ib4308b07adae19b000e3650adfec35850a0d8069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:43:31 +00:00
TreeHugger Robot
1d417eb96e
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: Id8892c00449726c527d09d8f500d5bc14c4603e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:39:13 +00:00
Bill Yi
a430d7f7be
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: Icc40f64ba45373d847b21df3ae5f55e924b9cbc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:38:57 +00:00
Bonian Chen
6a2479e7d1
Merge "[Settings] Code refactor for monitoring voice call status"
2022-04-22 09:37:08 +00:00
Bill Yi
4ad33b98b0
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663
Change-Id: Icdc2106032053bc4ee6dcd75eb39fa545a88505b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:32:14 +00:00
Bill Yi
2ba264fd2d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3 -s ours am: de73de0c47 -s ours am: c55eab5de8 -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: I20a4bd19fcf7e65a8edeb35c1c4c9ecba63bd29c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:31:45 +00:00
Bill Yi
6ae63e0465
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: Idd400ddd50075293cd93e065dddfa666827080c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:31:26 +00:00
Bill Yi
0e6d307c19
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f -s ours am: 8c88568430 -s ours am: 4061677234 -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: I26d0075109ac8de0fe790f7c1197a9b60494348f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:31:09 +00:00
TreeHugger Robot
5422c75c63
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3 am: 21a233b016 am: ac7f4cf8c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346
Change-Id: Iddd4d76e561e713e3bed1a5a7299f98726a84a1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:29:15 +00:00
Bill Yi
ad66cb353a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372 -s ours am: 430feee676 -s ours am: 297c6c02a8 -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: I29c1218344b6e38f02d9c82179df305058405b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:25:41 +00:00
Bill Yi
6312eaade6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3 -s ours am: a4dc078791 -s ours am: f9cd80a484 -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: I090c7f0a7de3fb451ac533082f92115ba77f4c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:25:13 +00:00
Bill Yi
7866a63876
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1 -s ours am: 304ef2074f -s ours am: e6e9f5cf87 -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: Ic01ab2e5d0d6145671cab982bd0f34a6aac6f7f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 09:24:54 +00:00
