Bill Yi
dc3bf1e5a2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 7faa876046
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649788
Change-Id: I5384e92e89c91c718abb4e17c4afd2e1814de0fd
2021-08-23 04:37:29 +00:00
Bill Yi
8c0f2e1e12
Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-mainline-prod am: f75d95cc99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792
Change-Id: Ia37b39f9121b9460b9cda8d6e703c471eabf743b
2021-08-23 04:37:17 +00:00
Bill Yi
cb4d8096f9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792
Change-Id: I58f268fd7d26810a26cca56473268696e8a0dc1a
2021-08-23 04:37:10 +00:00
Bill Yi
e8eeb4a1ec
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792
Change-Id: Ie84b2cd119dc71eea967c30a3c522aaf86f3ddb2
2021-08-23 04:37:03 +00:00
ykhung
37ddf4bc3e
[B&R] backup the battery optimization mode for installed apps
...
BYPASS_INCLUSIVE_LANGUAGE_REASON=legacy method name
Test command for backup manager:
adb shell bmgr backupnow com.android.settings
adb shell dumpsys backup | grep Current
Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I4671e48a9d3b315362b451384db637d5cae36a4d
2021-08-23 12:32:07 +08:00
Bill Yi
7faa876046
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-08-23 04:22:11 +00:00
Bill Yi
62091e911c
Merge changes from topic "presubmit-am-dc85c8230a004703b0180742d1a9fbf3"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a79808bce4
Import translations. DO NOT MERGE ANYWHERE
2021-08-23 04:22:11 +00:00
Bill Yi
46902bd366
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-23 04:21:54 +00:00
Bill Yi
38f55441d3
Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
Import translations. DO NOT MERGE ANYWHERE
2021-08-23 04:21:54 +00:00
Bill Yi
a536531bd9
Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
Import translations. DO NOT MERGE ANYWHERE
2021-08-23 04:21:54 +00:00
Bill Yi
f75d95cc99
Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-mainline-prod
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
Import translations. DO NOT MERGE ANYWHERE
2021-08-23 04:21:54 +00:00
Bill Yi
6c5836f818
Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
2p: ce5eb2ba02
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
Import translations. DO NOT MERGE ANYWHERE
2021-08-23 04:21:54 +00:00
Bill Yi
8ec4ca3069
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours am: a09970a7c7
-s ours am: 7e20c76c5e
-s ours am: abc69e0913
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: I03029f67021b43536493a6239e6a93e50c28ff61
2021-08-22 18:57:08 +00:00
Bill Yi
a92c0c664f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours am: c4934a29a9
-s ours am: 27583c0a16
-s ours am: fb032fde96
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: I04ac8e4b1bac8d76035c2776790e167eb6ede44c
2021-08-22 18:56:47 +00:00
Bill Yi
4ccefe2518
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours am: a09970a7c7
-s ours am: ac54544c91
-s ours am: cfe2aa8e35
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: Id3953f42e6962edb83f09717939d73aa4eb5e590
2021-08-22 18:56:26 +00:00
Bill Yi
726e72d84f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours am: c4934a29a9
-s ours am: 1b5eff63fc
-s ours am: 52292c0d76
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: I18f39b1e882547502250eaaba214cd3862e76ccb
2021-08-22 18:56:06 +00:00
Bill Yi
88a7a66c42
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours am: 75efc0cd4b
-s ours am: f51eb39d65
-s ours am: 19bfb2d5c9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: I2272377633452ebbbeef5104a5acbed9f76f2884
2021-08-22 18:55:46 +00:00
Bill Yi
1d4538d025
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours am: d66da997ef
-s ours am: 63aecef661
-s ours am: 3af8be69fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: I7dce4cb5cea5ed733fb6ee935dca0ea4755d9bc0
2021-08-22 18:55:22 +00:00
Bill Yi
abc69e0913
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours am: a09970a7c7
-s ours am: 7e20c76c5e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: I2e6ce8568e9fc3a29f4e4a30f8e62d6c7816b41f
2021-08-22 18:45:56 +00:00
Bill Yi
fb032fde96
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours am: c4934a29a9
-s ours am: 27583c0a16
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: Id92c6b1a96e0f1eefd94aecc2e3648e86811f08a
2021-08-22 18:45:42 +00:00
Bill Yi
cfe2aa8e35
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours am: a09970a7c7
-s ours am: ac54544c91
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: I3de1ad688a55e2f8fc0ec8ab2c36910290a128eb
2021-08-22 18:41:38 +00:00
Bill Yi
52292c0d76
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours am: c4934a29a9
-s ours am: 1b5eff63fc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: If607710ee1198ad8f883359d50ff0d7403f50305
2021-08-22 18:41:23 +00:00
Bill Yi
19bfb2d5c9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours am: 75efc0cd4b
-s ours am: f51eb39d65
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: I0ab8edc2154205f6693598d96e25a4533b4a0500
2021-08-22 18:41:08 +00:00
Bill Yi
3af8be69fd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours am: d66da997ef
-s ours am: 63aecef661
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: Ief86c60d3a9922364fd42aee90a8e29c3f749527
2021-08-22 18:40:53 +00:00
Bill Yi
7e20c76c5e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours am: a09970a7c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: I878bdc4a465b24c6757c64d5cdd9b9757a55fca7
2021-08-22 18:33:28 +00:00
Bill Yi
ac54544c91
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours am: a09970a7c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: I170f5b1ce0c25079b8f405bbe297a8f93a7429c6
2021-08-22 18:33:20 +00:00
Bill Yi
1b5eff63fc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours am: c4934a29a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: Ifbe1ff8d2d75aa39b46e505cce5c68c5c7b05c35
2021-08-22 18:33:01 +00:00
Bill Yi
27583c0a16
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours am: c4934a29a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: I3d317d20fc66adfb85a64cd03b897cfb40e59064
2021-08-22 18:33:00 +00:00
Bill Yi
1d7c852537
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours am: 33f540213a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: I787039dba9d86614149e8410434342ef8e98dab4
2021-08-22 18:27:12 +00:00
Bill Yi
f51eb39d65
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours am: 75efc0cd4b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: Ifea626a170c56f11c32e5e84de3956d2c3c355e0
2021-08-22 18:26:58 +00:00
Bill Yi
da92745ae4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours am: cc357115f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: Id1398e9ed1a7b5eb17631abf509642f1e6f45b48
2021-08-22 18:26:47 +00:00
Bill Yi
63aecef661
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours am: d66da997ef
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: I78d1728d3d22007702de625ec1d6b773139afe68
2021-08-22 18:26:41 +00:00
TreeHugger Robot
bc64b4e00e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 2bd8661d40
-s ours am: cea531d25f
-s ours am: f3e12c0d3c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15650237
Change-Id: I1d78878d51f8e56821bf762c14cc7c4f60164fd2
2021-08-22 18:26:18 +00:00
TreeHugger Robot
f3e12c0d3c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 2bd8661d40
-s ours am: cea531d25f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15650237
Change-Id: Ic2e48195de8200bcacae3dc4b0f667efa85142e8
2021-08-22 18:22:10 +00:00
Bill Yi
a09970a7c7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: I75a2d2ff05cb9fd3c74bd16aa06a0893dcf7dd2a
2021-08-22 18:18:05 +00:00
Bill Yi
c4934a29a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: I9e63f46f668fab0c59ad240d952d0dc2d63fe09c
2021-08-22 18:17:53 +00:00
TreeHugger Robot
5e47cd3d02
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 2bd8661d40
-s ours am: 7d5abfaa04
-s ours am: fce4bebfc4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15650237
Change-Id: I0a3476f8aeab3ac0d2138d46ebf2423e3dcf36f8
2021-08-22 18:17:31 +00:00
Bill Yi
33f540213a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: I36ff2be3ac56b532491235567b28486736b411f5
2021-08-22 18:17:27 +00:00
Bill Yi
75efc0cd4b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: Ib34afcfdd9953968c0e2b13cf454e3e9173c2b18
2021-08-22 18:17:18 +00:00
TreeHugger Robot
3d5c73b7e2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e8da5d2aed
-s ours am: aa8bac5523
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15650238
Change-Id: I4da7b87867ad18063022963326d808ddd3563807
2021-08-22 18:17:18 +00:00
Bill Yi
cc357115f8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: I794248c5648d7a82dd30ae511329380af527984d
2021-08-22 18:17:11 +00:00
Bill Yi
d66da997ef
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: I60c3c3b85e60b3afeb4a8767852c5f3fc745880e
2021-08-22 18:16:59 +00:00
TreeHugger Robot
fce4bebfc4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 2bd8661d40
-s ours am: 7d5abfaa04
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15650237
Change-Id: I61817a52c45380743709b1e00f6b2a79ef554803
2021-08-22 18:16:57 +00:00
TreeHugger Robot
cea531d25f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 2bd8661d40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15650237
Change-Id: I82aa3df4489ad5f788a10cf1bfafbef3a986fae5
2021-08-22 18:08:15 +00:00
Bill Yi
3ed7097ead
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: Iccc05891ae6764d10ebfef8e47ac43ffa07956ac
2021-08-22 18:07:39 +00:00
Bill Yi
7643d374b5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: Ic0611b0fd5f645d0c69ee539ebc746fddd4d59be
2021-08-22 18:02:27 +00:00
TreeHugger Robot
7d5abfaa04
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 2bd8661d40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15650237
Change-Id: I52fcb21da4f94243efbe577308f08eb5474fdbd3
2021-08-22 18:02:21 +00:00
TreeHugger Robot
aa8bac5523
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e8da5d2aed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15650238
Change-Id: Ibc4e588732aa66ea4fc50d643ef5b694483402a7
2021-08-22 18:01:59 +00:00
TreeHugger Robot
dde53740fc
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-08-22 17:45:29 +00:00
TreeHugger Robot
2bd8661d40
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-08-22 17:45:19 +00:00