Arc Wang
03b1b23c74
Fix 'Documents & other' missing problem
...
Should check if 'Documents & other' is visible
when mVolume is updated.
Bug: 230215783
Test: manual visual
Settings -> Storage
Change-Id: Ife36b71bee66ff16802e352785824e10c17dceb8
2022-04-24 15:30:16 +08:00
Treehugger Robot
3ff1c69be2
Merge "Update OWNERS file for enterprise modules in Settings" am: 0edc7fb3cb am: 08f97c9bc0 am: 7191d7d09d am: 97d9c0fd07
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064127
Change-Id: I61eaf88879353c3847e6049e5736277a35213905
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-23 20:45:09 +00:00
Treehugger Robot
97d9c0fd07
Merge "Update OWNERS file for enterprise modules in Settings" am: 0edc7fb3cb am: 08f97c9bc0 am: 7191d7d09d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064127
Change-Id: Ia710b1bd651880e0dddc39f6cb41d168c18c96ee
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-23 20:20:58 +00:00
Treehugger Robot
7191d7d09d
Merge "Update OWNERS file for enterprise modules in Settings" am: 0edc7fb3cb am: 08f97c9bc0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064127
Change-Id: I016b3fa9032e278a9d88b842b0e72f460b71d6c6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-23 19:56:36 +00:00
Treehugger Robot
08f97c9bc0
Merge "Update OWNERS file for enterprise modules in Settings" am: 0edc7fb3cb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064127
Change-Id: Iec813ee718cda4e6d0bd5a32ec6a2af9a136cfaa
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-23 19:38:41 +00:00
Prabal Singh
67007e5933
Use settingslib util methods for work policy info
...
Bug: b/229889270
Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I0d968732a4dd601955e18b2ebb2af365638b450f
2022-04-23 20:35:41 +01:00
Treehugger Robot
0edc7fb3cb
Merge "Update OWNERS file for enterprise modules in Settings"
2022-04-23 18:55:44 +00:00
Nate Myren
d1749cfbab
Allow intent into Privacy Controls page
...
Test: manual
Bug: 222127397
Change-Id: If98ce8b89332eaaaa9be70885afe9d8465c191dd
2022-04-22 13:58:50 -07: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
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
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
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
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
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
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: 226baf6f257d5cc42c815c7d0155a85df4451e95af08983841f1b797ac9be74c40fc842d57766d2c
2022-04-22 09:24:27 +00:00
