Commit Graph

104723 Commits

Author SHA1 Message Date
Lucas Silva
d8b90650d3 Update dream settings categories, to fix padding.
The extra PreferenceCategory is adding some unnecessary padding, so
removing it. Instead of using a preference category to enable/disable
all items, we just iterate through all the preferences when
enabling/disabling items.

Bug: 227139218
Test: locally on device
Change-Id: I403295fbccb7b135b7d603cd1fc713c4c0189569
2022-04-14 18:59:53 +00:00
Bill Yi
67a0f15f49 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b67694c1cb -s ours am: 20efc0cc64 -s ours am: 57e6a29f1a -s ours am: 1b81748070 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I82de40213e56a9829013bbc9762f5e9d52700450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:58:30 +00:00
Bill Yi
f2190ed871 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f5b29384 -s ours am: 4b073cf421 -s ours am: d700cfe212 -s ours am: a4d9b83149 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8fc3de607737e3c7f173e915d6ab2063ff51fa9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:58:29 +00:00
TreeHugger Robot
1501a5ee96 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e3b581c350 -s ours am: 0312b67407 -s ours am: 1fd59e05d9 -s ours am: efed78d9fc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I46159f1ff07496f7e35eca25f99b2b72ada506bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:58:22 +00:00
Lucas Silva
46ad7f8581 Merge "Add hyphenation to customize button text." into tm-dev am: b31dbbb1cf am: f8c7a84eb8 am: 86d973a79c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17758405

Change-Id: I0701d5ac9a1fe41878e29b218c3aeda313eed33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:58:15 +00:00
TreeHugger Robot
6715e00db7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2212edb907 -s ours am: e9c60d9d72 -s ours am: b6e489cd56 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I82b3e17c6259cd782a95776993f4cfbd57cd533e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:58:06 +00:00
Bill Yi
a5347a2508 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23f2bfb3a3 -s ours am: 942891fc3c -s ours am: e2a173d3a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5b00a6bc8195826f6ee4c2ae93d9096b018b7b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:58:03 +00:00
TreeHugger Robot
bd32beb820 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2880f9c765 -s ours am: 0ec6ee3588 -s ours am: b614bf28ad -s ours
am skip reason: subject contains skip directive

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

Change-Id: I81836e98d7ce7b52b10610d30f0843eda1db2a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:57:48 +00:00
Bill Yi
6fcade372e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b31a221ace -s ours am: da6144dcbd -s ours am: f0890308c5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6ec3e6a3c7e0e1953c250231947479e05a0b10eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:57:47 +00:00
TreeHugger Robot
01768c181f Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev am: 55e91da24e am: fe3d04de86 am: 69929e2dcd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184

Change-Id: I88f5c3ddda6cd00666374ead67a334e59b77d62a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:55:05 +00:00
Bill Yi
15099574fe [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0 am: 5a7f4fcb00 -s ours am: 7044a2ee63 -s ours am: 204786c737 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icde7af29a030c1aa02e13f76ddea9a915d5e4d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:55:04 +00:00
Bill Yi
4cda8d653b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 89a0c5fb00 -s ours am: 4801f9a9aa -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icde201bf92379fa34acecc80310a251eccf5c2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:44:08 +00:00
Bill Yi
949f1aa25f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8fac9ad72b -s ours am: 98baf75c26 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib200de46ac154aea627f3fac5b7891bc3e1d4478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:44:06 +00:00
Bill Yi
1bff32b2c0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 08549ed959 -s ours am: ee6033af75 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I618cfc03f54ad96e1a585de8b611c353a0c96d4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:39:50 +00:00
Bill Yi
369f30ab9e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5491463fe6 -s ours am: 01ef39c8b1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I502816906a2a211a64a9231ec80b760f937b5c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:39:49 +00:00
TreeHugger Robot
a0e140b728 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -s ours am: d22b43c6a5 -s ours am: a5a1c5710e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5dbab8c22aa49cfed736a1ef24e739b3e70acc90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:37:17 +00:00
Bill Yi
a14e9514c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours am: 812e79c8cf -s ours am: db2dfb95da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4ab2b23eb3b46e580cc43d0ca3afc149631c81d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:37:16 +00:00
TreeHugger Robot
c0473f683a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c -s ours am: c53da610b2 -s ours am: f26007c8ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic25e06d7ff34f2d46236d40b25a3b6d2e5336c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:36:31 +00:00
Bill Yi
d975bfd607 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550 -s ours am: 57b6374513 -s ours am: 006db32086 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifb5919cb0820eb6489fca924977c81612cbc3b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:36:28 +00:00
TreeHugger Robot
edfab288ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -s ours am: d22b43c6a5 -s ours am: a5a1c5710e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ide621c4e166819a8536b3a90cc867f5133ba5b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:35:51 +00:00
Bill Yi
51bb20b3d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours am: 812e79c8cf -s ours am: db2dfb95da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I21e6b1da5e9f34d8d7ac15e7b9df806eaa0cf817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:35:50 +00:00
TreeHugger Robot
e7eaab7e60 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c -s ours am: c53da610b2 -s ours am: f26007c8ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iccbf6d891e5ce1d1c79aa5aa99a0a5e6b827d0b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:35:17 +00:00
Bill Yi
8aed68a1e6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550 -s ours am: 57b6374513 -s ours am: 006db32086 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If26e9374379b7748fd4aae371d07b62b92f7231f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:35:16 +00:00
Bill Yi
1b81748070 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b67694c1cb -s ours am: 20efc0cc64 -s ours am: 57e6a29f1a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I62b36e9375cc4bbc6035444498332eba81cb015f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:19:27 +00:00
Bill Yi
a4d9b83149 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f5b29384 -s ours am: 4b073cf421 -s ours am: d700cfe212 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e93993b9c4031bc071da3ba83faa8fe1b965855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:19:26 +00:00
TreeHugger Robot
efed78d9fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e3b581c350 -s ours am: 0312b67407 -s ours am: 1fd59e05d9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id65e97c0a8085b93ce05cc97bbaa5f42d1650d85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:19:07 +00:00
Lucas Silva
86d973a79c Merge "Add hyphenation to customize button text." into tm-dev am: b31dbbb1cf am: f8c7a84eb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17758405

Change-Id: Ie5e66a433141ff2273c9d6cbdf140d3424fe0d47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:18:54 +00:00
TreeHugger Robot
b6e489cd56 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2212edb907 -s ours am: e9c60d9d72 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I67c36a32fd6af0572d278e978fd38233a821ae2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:18:21 +00:00
Bill Yi
e2a173d3a8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23f2bfb3a3 -s ours am: 942891fc3c -s ours
am skip reason: subject contains skip directive

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

Change-Id: If5f5a927ede5b3a4dd806853f7526670db9d61be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:18:20 +00:00
Bill Yi
22a11ae211 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b67694c1cb -s ours am: 20efc0cc64 -s ours am: 35b98a573e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id005007788346bacfa71854eee8094b736fe88c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:15:46 +00:00
Bill Yi
3479ca9c08 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f5b29384 -s ours am: 4b073cf421 -s ours am: bcf07d3494 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I62e317be894537bfd5f080dce5832eac4ac9cc2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:15:45 +00:00
TreeHugger Robot
8d5d8b6b15 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e3b581c350 -s ours am: 0312b67407 -s ours am: 707734caa1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I64c8695942115beee62e7aca4e2d0913a84b45d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:15:29 +00:00
TreeHugger Robot
a5a1c5710e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -s ours am: d22b43c6a5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6370b4b7c11bdb4d2514c601acd93b141060e7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:14:55 +00:00
Bill Yi
db2dfb95da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours am: 812e79c8cf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I86f0b1dc43806b330b5d18f36aba3dea181b14ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:14:52 +00:00
Lucas Silva
0ddf1615a4 Merge "Add hyphenation to customize button text." into tm-dev am: b31dbbb1cf am: 2e5ef5b243
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17758405

Change-Id: I1ef1106c9e47e588ca8d310e51d15f87bf778e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:14:36 +00:00
TreeHugger Robot
4e79d2c9a7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2212edb907 -s ours am: 36d4b842e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9aa3a7b70f7bf056774f921f3fe644e65c7578ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:14:22 +00:00
Bill Yi
ba37f56c74 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23f2bfb3a3 -s ours am: 1c67732678 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibd41baad6a50cbe1c2d0e67dddb9eea76d2393d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:14:21 +00:00
TreeHugger Robot
f26007c8ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c -s ours am: c53da610b2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id50ca54e69d4273ef635cce3db7f15ded82a0163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:14:04 +00:00
Bill Yi
006db32086 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550 -s ours am: 57b6374513 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I511a9059ccf3c323d7eb7cc96438b3c27bff6bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:14:00 +00:00
TreeHugger Robot
b614bf28ad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2880f9c765 -s ours am: 0ec6ee3588 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib71cad3874d96d31d0bf8aea04abf685e454996a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:13:45 +00:00
Bill Yi
f0890308c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b31a221ace -s ours am: da6144dcbd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iccf6e7b6d9995f5514c0c82db7d67b31052ca709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:13:43 +00:00
TreeHugger Robot
d4044231c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2880f9c765 -s ours am: ff58aef35b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9af2cf6edd02df43ce2846dfb0211695d5d5f1b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:13:15 +00:00
Bill Yi
a012eefeed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b31a221ace -s ours am: 52fcdc6fdc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I87bc7f1017cf3ab1a138cca9e32c7b8948ad795d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:13:14 +00:00
TreeHugger Robot
69929e2dcd Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev am: 55e91da24e am: fe3d04de86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184

Change-Id: I2e24d1cbce2ac8bea5045f41156a534df5fd0c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:13:04 +00:00
Bill Yi
204786c737 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0 am: 5a7f4fcb00 -s ours am: 7044a2ee63 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2dd09d9c797d630bf7953ef9eb89557012b9f4a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:13:03 +00:00
TreeHugger Robot
c2b55a3690 Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev am: 55e91da24e am: ff1617a8fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184

Change-Id: I5b9860883523fbdc9997aa04c4514c1f68af556c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:12:59 +00:00
Bill Yi
254c52e64c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0 am: 5a7f4fcb00 -s ours am: c5dc2de7c5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie61dd13e90ba68184b4c0c14a3aa619c2aea5990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:12:58 +00:00
Bill Yi
4801f9a9aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 89a0c5fb00 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55225551206e9b9b72a15fd08fd09de6bfb4c06f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:12:20 +00:00
Bill Yi
98baf75c26 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8fac9ad72b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I110823dbe4bfacea28daa5efef2674095146af55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:12:19 +00:00
Bill Yi
82934365ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8d00d149a6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic43ade7c8b1381d4d14649991c2fc699a2173a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:12:01 +00:00