PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,400 Commits 1 Branch 0 Tags
710c94e17a07e87e74b9e031e78ff47aaa663f81
Commit Graph

105400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bill Yi
cfa7dd6ec6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f -s ours am: 4a4c5fd413 -s ours am: a1be6fe405 -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: I7e9c8432b739bbfe5475149dd62389e1d06d494e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 09:24:38 +00:00
Automerger Merge Worker
7752b9dacd Merge changes from topic "am-0e7676448c5b4e55bb221cb7ed291f45" into tm-qpr-dev-plus-aosp 
* changes:
  [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
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours am: f1b797ac9b -s ours am: e74c40fc84 -s ours am: 2d57766d2c -s ours
 2022-04-22 09:24:27 +00:00
Stanley Wang
fea3e82627 Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88 am: 18206def81 am: 0f2adc2166 am: 275f73f0f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356

Change-Id: Ic57fb8a67cd9ca0f32c4cd9edfa4f45adba4efe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 09:23:55 +00:00
TreeHugger Robot
ab5c598b54 Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3 am: fb74f218a9 am: 56c72e3ede 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346

Change-Id: I9893c384ee4489986ce739eb75389822ca1cfd75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 09:23:42 +00:00
TreeHugger Robot
7ff9620b02 [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 skip reason: subject contains skip directive

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

Change-Id: Ic614b16b2201200f30ff0c53bbb2b29e61a2c7a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 09:23:10 +00:00
Bill Yi
b80698d50d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours am: f1b797ac9b -s ours am: e74c40fc84 -s ours am: 2d57766d2c -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: Ie6d54bfab09f02b03de54d363e69f38cb65b7d57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 09:22:55 +00:00
TreeHugger Robot
5df4451e95 [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 skip reason: subject contains skip directive

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

Change-Id: I89d3af3b6ef6b6761ad7f964a26dfb7b2c3d1285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 08:56:58 +00:00
Bill Yi
2d57766d2c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours am: f1b797ac9b -s ours am: e74c40fc84 -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: I31d7b6851adec96ae762d12456497cf5d742ed3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 08:56:42 +00:00
TreeHugger Robot
5d519803ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25 -s ours am: 7d5cc42c81 -s ours am: 2b2fab41f2 -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: I6acc342f4d89d45d2d1b613f48708e1a2ee2ced2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 08:56:37 +00:00
Bill Yi
e8ffc3d41a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours am: f1b797ac9b -s ours am: 52294cceea -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: I036c2d936d0043ec7a91b5f976255dfb8fb3c3f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 08:56:20 +00:00
Automerger Merge Worker
aa2ed50e34 Merge changes from topic "am-0af370f6b33542b09d673716bbc90c20" into tm-d1-dev-plus-aosp 
* changes:
  [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
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours am: f1b797ac9b -s ours am: e74c40fc84 -s ours
 2022-04-22 08:30:32 +00:00
TreeHugger Robot
69acf57ed4 [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 skip reason: subject contains skip directive

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

Change-Id: Ie819eb7ee6d278600746aa2abf460c719dca40fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 08:29:31 +00:00
Bill Yi
f319170f36 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours am: f1b797ac9b -s ours am: e74c40fc84 -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: Ib856ed06b9c04dcde4046f203421e9dad8004561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 08:29:12 +00:00
TreeHugger Robot
45f2cc4a18 [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 skip reason: subject contains skip directive

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

Change-Id: I9debab53eab77d49cfad8fbc16478a641a5baa5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 08:28:43 +00:00
Bill Yi
8e7b0e6168 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours am: f1b797ac9b -s ours am: 2affff9747 -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: I3972d0ebabf19df58ae5abc285e03d081f78e2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 08:28:26 +00:00
Bill Yi
2fbc122a96 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372 -s ours am: 896ea5769a -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: I372cea0699af4aba561966f122f4c30b3cb1cbde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 08:22:05 +00:00
Bill Yi
c55eab5de8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3 -s ours am: de73de0c47 -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: Ibbd3890ea2856cf551ca35806385ec3e61339c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 08:21:38 +00:00
Bill Yi
8a9c502802 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1 -s ours am: 9ea6d0e609 -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: Ie39ff0e257acab9d06fb32f8f4e296728e7d768d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-22 08:21:16 +00:00