ykhung
|
adec23a106
|
[B&R] restore the backup data for app optimization mode back
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
adb shell bmgr restore 3e9867a7660315b8 com.android.settings
Bug: 192523697
Test: make SettingsRoboTests
Change-Id: Ia35f8caa8fe2408be28c3494785a174a1aeb11da
|
2021-08-30 06:45:26 +00:00 |
|
Bill Yi
|
b089d5fdb8
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948 -s ours am: 7514b30f06 -s ours am: 6ee3b9fe8a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Ied0547f45bb052ec2950e48e73cf08b3721a16c7
|
2021-08-29 20:53:56 +00:00 |
|
Bill Yi
|
b4971c8081
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours am: 3fb65a4774 -s ours am: 05320e232c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: Iaeae63a70ee7d69fde348692975df5dfbe2062a3
|
2021-08-29 20:52:56 +00:00 |
|
Automerger Merge Worker
|
3076270ac6
|
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948 -s ours am: 4a7694c598 -s ours" into sc-qpr1-dev-plus-aosp am: f0125f178a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I7a995a143a62de8c38271a4fb75a3c0ae941cb20
|
2021-08-29 20:52:07 +00:00 |
|
Bill Yi
|
40920a9988
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948 -s ours am: 7514b30f06 -s ours am: 92c5bac1ee -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: If3688649cb0d134641fb4c802a8dee6fcfebf6dd
|
2021-08-29 20:50:06 +00:00 |
|
Bill Yi
|
0f298f914e
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours am: 3fb65a4774 -s ours am: 3f5f5f723d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I47145585902025298923715fdb8034b64a44b868
|
2021-08-29 20:50:02 +00:00 |
|
Bill Yi
|
5925687faa
|
Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev am: 0d2b7238bc am: cd985a6cda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I9c24042908cab8d571b1b2504d3ef07057649363
|
2021-08-29 20:49:56 +00:00 |
|
Bill Yi
|
c41d771696
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 am: 1a1eba9262 -s ours am: 04d8c15606 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Iabb84f9921bbe64eafe23ea6ff2bb2ece3b085b1
|
2021-08-29 20:49:55 +00:00 |
|
Bill Yi
|
672aef8317
|
Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev am: b7f7a895fd am: c0170add88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I7c24660c490a0dadf9c4d82abec0976cfe59e75a
|
2021-08-29 20:47:53 +00:00 |
|
Bill Yi
|
a6229746ea
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 am: 30f4367fed -s ours am: dca06614d7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: Ib42badd4b757935d9eb247a4aabe6bd4f0b5f016
|
2021-08-29 20:47:51 +00:00 |
|
Bill Yi
|
d375f28fd9
|
Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev am: 0d2b7238bc am: 7b3a20b43d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Iaa2181598a2bfcc8a97fe5630f7ae050c13d6f51
|
2021-08-29 20:46:27 +00:00 |
|
Bill Yi
|
ef9b084efb
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 am: 1a1eba9262 -s ours am: 74f497939e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Ib200f404e6694cc471161af167a422e91f11eda1
|
2021-08-29 20:46:27 +00:00 |
|
Bill Yi
|
de99d262e0
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours am: 1f17c42c16 -s ours am: 8239b2a6a8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I231341792d38993cd025197ba7fc2f73486d02ae
|
2021-08-29 20:45:43 +00:00 |
|
Bill Yi
|
77bff5ef7f
|
Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-dev-plus-aosp am: 3c86e4eb2d am: 9cc95ebe5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: If52ec4968d8841768e0d433b219bc010da9fb286
|
2021-08-29 20:45:06 +00:00 |
|
Bill Yi
|
64e5c9de09
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 am: df34345697 -s ours am: da1bc4bff5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Idc082ac4539ff2e9598223db17e58793879c1757
|
2021-08-29 20:45:06 +00:00 |
|
Bill Yi
|
bcbe3382ff
|
Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev am: b7f7a895fd am: 91021b56dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I54d1f073416ca12441b25504c8917ed560f823f9
|
2021-08-29 20:43:27 +00:00 |
|
Bill Yi
|
c379e0ec81
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 am: 30f4367fed -s ours am: d026c13fc6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I8e99e9781f340aa3c54284de6abe194caf61caa5
|
2021-08-29 20:43:26 +00:00 |
|
Bill Yi
|
92c1605bf8
|
Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-dev-plus-aosp am: 110c972e70 am: edc641b1bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: Ic44a5c196626f22a982c019e4eae1165e82097b9
|
2021-08-29 20:42:18 +00:00 |
|
Bill Yi
|
3301afbdf1
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 am: a60710d90a -s ours am: 9a2e9009d3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I753967f0ac2065569408cc7378982fb6c9337f21
|
2021-08-29 20:42:16 +00:00 |
|
Bill Yi
|
6ee3b9fe8a
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948 -s ours am: 7514b30f06 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I7654c16cf3d03862a8c14767ba80d0621e5684fe
|
2021-08-29 20:34:02 +00:00 |
|
Bill Yi
|
05320e232c
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours am: 3fb65a4774 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I617e4b8b03b02045bbda51b79e641593eee5f5e1
|
2021-08-29 20:33:44 +00:00 |
|
Bill Yi
|
92c5bac1ee
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948 -s ours am: 7514b30f06 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Idf6d3083a3031388b872cf1270afb4a1afb9992e
|
2021-08-29 20:33:30 +00:00 |
|
Bill Yi
|
3f5f5f723d
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours am: 3fb65a4774 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: Ic56dfe50044196e1fc6469e1a6da1424d480bb9e
|
2021-08-29 20:33:23 +00:00 |
|
Automerger Merge Worker
|
f0125f178a
|
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948 -s ours am: 4a7694c598 -s ours" into sc-qpr1-dev-plus-aosp
|
2021-08-29 20:32:33 +00:00 |
|
Bill Yi
|
c64842a1f5
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948 -s ours am: 4a7694c598 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Ic6cc2eff4f54925bcbe4f3e23e981bdc2bf8e8c4
|
2021-08-29 20:32:31 +00:00 |
|
Bill Yi
|
7b3a20b43d
|
Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev am: 0d2b7238bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I2587536f2eb8e7050555110ec969d8c9e5324f25
|
2021-08-29 20:32:28 +00:00 |
|
Bill Yi
|
74f497939e
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 am: 1a1eba9262 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I97c7379d45c961c40dc4fc479d926ce073016be4
|
2021-08-29 20:32:27 +00:00 |
|
Bill Yi
|
cd985a6cda
|
Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev am: 0d2b7238bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I32caa59dc27a804810223e068b18de4c4a418f3c
|
2021-08-29 20:31:34 +00:00 |
|
Bill Yi
|
04d8c15606
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 am: 1a1eba9262 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I2bf6b6155f6aef09a7a42a54d8e18d3b8fb915f9
|
2021-08-29 20:31:34 +00:00 |
|
Bill Yi
|
8239b2a6a8
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours am: 1f17c42c16 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: Id749548b969c6a12adc9dac11445681c779e76fb
|
2021-08-29 20:31:05 +00:00 |
|
Bill Yi
|
4a7694c598
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I1ea6e2e3d955b85585ec6a9151964ed228408f63
|
2021-08-29 20:30:11 +00:00 |
|
Bill Yi
|
9cc95ebe5b
|
Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-dev-plus-aosp am: 3c86e4eb2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Ic5b3c88919a60f39260376003c5d7592f3ea9d18
|
2021-08-29 20:29:52 +00:00 |
|
Bill Yi
|
da1bc4bff5
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 am: df34345697 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Ib093788d253564ade3cd80e33a704e1158b81e8a
|
2021-08-29 20:29:51 +00:00 |
|
Bill Yi
|
c0170add88
|
Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev am: b7f7a895fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I667cc3cebf4eb0ebb38cfcb54aff136df5248f19
|
2021-08-29 20:29:50 +00:00 |
|
Bill Yi
|
dca06614d7
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 am: 30f4367fed -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I2d1361ecdfb4910e108ecdada74a33323ed2f99b
|
2021-08-29 20:29:49 +00:00 |
|
Bill Yi
|
7514b30f06
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Idd84831c2a7385823179a9bf6c9ad66c744e9eff
|
2021-08-29 20:29:02 +00:00 |
|
Bill Yi
|
91021b56dc
|
Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev am: b7f7a895fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: Ie6e743cc3615104d55204925cf728dacb405cea4
|
2021-08-29 20:28:34 +00:00 |
|
Bill Yi
|
d026c13fc6
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 am: 30f4367fed -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I588fea79f9a9b81a879a275459f075c76df712b4
|
2021-08-29 20:28:28 +00:00 |
|
Bill Yi
|
3fb65a4774
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I2eeded04160aee20dfbdb492b9ce770a829dab25
|
2021-08-29 20:27:44 +00:00 |
|
Bill Yi
|
edc641b1bf
|
Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-dev-plus-aosp am: 110c972e70
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: Id20bf59d39993777389eea39b6d53be6f540cf8c
|
2021-08-29 20:27:37 +00:00 |
|
Bill Yi
|
9a2e9009d3
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 am: a60710d90a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I02fa5d5853913144419d79e9cfc7fab2947ca5ff
|
2021-08-29 20:27:36 +00:00 |
|
Bill Yi
|
1f17c42c16
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I676bc81dd2f0026702ac5cf128653338e9683502
|
2021-08-29 20:27:25 +00:00 |
|
Bill Yi
|
31208c4948
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
|
2021-08-29 20:09:43 +00:00 |
|
Bill Yi
|
0d2b7238bc
|
Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440
Import translations. DO NOT MERGE ANYWHERE
|
2021-08-29 20:09:43 +00:00 |
|
Bill Yi
|
3c86e4eb2d
|
Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-dev-plus-aosp
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440
Import translations. DO NOT MERGE ANYWHERE
|
2021-08-29 20:09:43 +00:00 |
|
Bill Yi
|
b7f7a895fd
|
Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3
Import translations. DO NOT MERGE ANYWHERE
|
2021-08-29 20:09:03 +00:00 |
|
Bill Yi
|
a5d0f92e0c
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
|
2021-08-29 20:09:03 +00:00 |
|
Bill Yi
|
110c972e70
|
Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-dev-plus-aosp
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3
Import translations. DO NOT MERGE ANYWHERE
|
2021-08-29 20:09:03 +00:00 |
|
TreeHugger Robot
|
1e55cbb986
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4c1ee5ab6a -s ours am: 4d7546b098 -s ours am: 82f0ae4930 -s ours am: f330ceb0b9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697170
Change-Id: Ibc95a8b584517771607207ff2fed0026ade2f52d
|
2021-08-28 09:15:42 +00:00 |
|
TreeHugger Robot
|
ff010b5803
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 41642f5ba8 -s ours am: c60b803327 -s ours am: cf5b05d878 -s ours am: e209ead577 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697447
Change-Id: I3a3fe2138601696912596ccd7dfaa85e0412dc1c
|
2021-08-28 09:15:37 +00:00 |
|