Bill Yi
dc217a8213
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-mainline-prod
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:13:42 +00:00
Bill Yi
a9b7463e6d
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
2p: a0633f5acf
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:13:42 +00:00
Bill Yi
8d5d3dc1af
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-09-20 13:13:04 +00:00
Bill Yi
cf8ea19226
Merge changes from topic "presubmit-am-4767d054095942768d54a95ec7cc02ab"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d06e16aba1
Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:13:04 +00:00
Bill Yi
fb733b7d84
Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:12:43 +00:00
Bill Yi
60b7cbbd6b
Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-mainline-prod
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:12:43 +00:00
Bill Yi
bbfe69ace0
Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
2p: 2d17d8bc0b
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:12:43 +00:00
Bill Yi
567de5c29b
Merge changes from topic "presubmit-am-649569b5abc842e09efe1b7b36c3b10b"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f8e6f5ed67
Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:12:30 +00:00
TreeHugger Robot
333f4503da
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: e9200b19ad
-s ours am: 59657f177e
-s ours am: 02a77829b2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860626
Change-Id: Ib777b549e188cf9cbd0010157a7475665abe3407
2021-09-20 06:50:58 +00:00
Bill Yi
66da57bccb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 918492ab2a
-s ours am: a5e8168fba
-s ours am: a78dd639be
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860618
Change-Id: I7f34f7ca239366bc850a7671405d15e6e2fb223c
2021-09-20 06:50:38 +00:00
TreeHugger Robot
a9627c5f2e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: e9200b19ad
-s ours am: 497e2a9ef1
-s ours am: 5dc558bf34
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860626
Change-Id: I9e9a7f24bda60ad061116b4e01738702f85a1b2a
2021-09-20 06:49:55 +00:00
Bill Yi
60c9e639f6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 918492ab2a
-s ours am: 3d70903686
-s ours am: 7d85761778
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860618
Change-Id: Iea0d8cbd141703ee950b425216d963e3b079de84
2021-09-20 06:49:08 +00:00
TreeHugger Robot
599e8a30f7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: ab040df5fe
-s ours am: ae7abb19af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860619
Change-Id: I014f9d13b52f4e6d91849b03805eb5dcc14bd777
2021-09-20 06:48:28 +00:00
TreeHugger Robot
02a77829b2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: e9200b19ad
-s ours am: 59657f177e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860626
Change-Id: I977819a7838da29d7bb06066a49653101153614d
2021-09-20 06:47:35 +00:00
Bill Yi
1b9e03bd01
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2f0cdea1f
-s ours am: 69668617dc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860647
Change-Id: Id34e6632c0dca43ef2538c1a3f81e3f33a7c3e05
2021-09-20 06:47:26 +00:00
Bill Yi
a78dd639be
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 918492ab2a
-s ours am: a5e8168fba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860618
Change-Id: I0a3e4ecee84b8d9cf4e9157a6edff726df54858d
2021-09-20 06:47:23 +00:00
TreeHugger Robot
5dc558bf34
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: e9200b19ad
-s ours am: 497e2a9ef1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860626
Change-Id: I54208f11995b7bf244fabd07edc9bcfa8b9e1c92
2021-09-20 06:36:38 +00:00
Bill Yi
7d85761778
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 918492ab2a
-s ours am: 3d70903686
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860618
Change-Id: I04f5196c5d47327b9f38345f2ecb08cf3599dd3b
2021-09-20 06:36:21 +00:00
TreeHugger Robot
ae7abb19af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: ab040df5fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860619
Change-Id: Id54a2607c1c320aff3cb10626858d8fab7dbf5f0
2021-09-20 06:35:56 +00:00
TreeHugger Robot
497e2a9ef1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: e9200b19ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860626
Change-Id: I8b80fcff9238db87538f802cf2513982c40cac4b
2021-09-20 06:35:17 +00:00
Bill Yi
69668617dc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2f0cdea1f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860647
Change-Id: Ifd5b519f6e608937c0a18b7b3c5f3bfe7e353cce
2021-09-20 06:34:40 +00:00
Bill Yi
3d70903686
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 918492ab2a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860618
Change-Id: Idebf6803d8b02897c85ede92394b94a563089065
2021-09-20 06:34:35 +00:00
TreeHugger Robot
59657f177e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: e9200b19ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860626
Change-Id: I0cf70cd38b40f5ff2a3cbec48ee1dde252628b6c
2021-09-20 06:34:10 +00:00
Bill Yi
a5e8168fba
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 918492ab2a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860618
Change-Id: I393b0d96d51a639aa387212c41c69a7a1d39dac9
2021-09-20 06:33:49 +00:00
TreeHugger Robot
fa69f1faa2
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-09-20 06:21:48 +00:00
TreeHugger Robot
ab040df5fe
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-09-20 06:20:06 +00:00
TreeHugger Robot
e9200b19ad
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-20 06:19:10 +00:00
Bill Yi
d2f0cdea1f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icba51573325d71efe8f7aa4cd4515eb57968778c
2021-09-18 17:28:47 +00:00
Bill Yi
62814d9f22
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6b0a170a252a9de2623da7a47afc456806c8b491
2021-09-18 17:24:49 +00:00
Bill Yi
c1272b8cb2
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
2p: 2d17d8bc0b
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I71a508719be01f9f9bbc07879fbca104cb23e76f
2021-09-18 17:21:31 +00:00
Bill Yi
13cb0a15ca
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I4085a5981c367f77f97bc248c7f2c7b0c6ed0349
2021-09-18 17:21:27 +00:00
Bill Yi
15c729b335
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I1e2d0d4f545ec2d4bf09ae29ecbd96baae53a432
2021-09-18 17:21:27 +00:00
Bill Yi
2d17d8bc0b
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I2b7bb955cc0d7bcb81c3b5cb8cd92f33bd318c88
2021-09-18 17:21:27 +00:00
Bill Yi
47ea4adaed
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iac26620cda40d2696577626befff4c5d811d35b7
2021-09-18 17:21:13 +00:00
Bill Yi
e76cf0278e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I18afee356af9e07f081f5a32611d747b43a9223e
2021-09-18 17:17:33 +00:00
Bill Yi
c5489eafd7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I17fd716757c5a61109f4d9f8729d2f939fa16674
2021-09-18 17:13:50 +00:00
Bill Yi
918492ab2a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5565d21fd52770ff7a0a72e0eee23373b5bbb9cd
2021-09-18 17:12:15 +00:00
Bill Yi
3c03b589dd
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
2p: a0633f5acf
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I7243daa62fd59723e953e6f85d765bdd9c42902c
2021-09-18 17:11:00 +00:00
Bill Yi
8e9c812e54
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I8d5c46d13d49354c21a5c434261e7c68290674b3
2021-09-18 17:10:55 +00:00
Bill Yi
6c50635319
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: If6b26166c7bc75f1879cd1cb5c34641732aa7a2e
2021-09-18 17:10:55 +00:00
Bill Yi
a0633f5acf
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I355fab3f76bf02c06354b075d06ee5d6c702eb83
2021-09-18 17:10:55 +00:00
Bill Yi
cc5e2f9643
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1b3e386baf72d68cdbb895055f61ed1f54817389
2021-09-18 17:10:42 +00:00
Bill Yi
aaeff17691
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id9fe855bd69cd8c950153e8ad30a929f8f6c0fbe
2021-09-18 17:09:08 +00:00
Bill Yi
7b93c3ea98
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaa16a73368d1b88512291d10b9c46abd127ab62e
2021-09-18 17:06:21 +00:00
Bill Yi
57b68bafb9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I78923511c8cd2c48b25e2105d234d4b510b5fe6b
2021-09-18 17:02:50 +00:00
Bill Yi
9cd0a38952
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d06e16aba1
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860611
Change-Id: Ib80b6af0d28f2539fb8f559c21653520a1c160f8
2021-09-18 16:57:00 +00:00
Bill Yi
d06e16aba1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1fa23143324065d3ac91d9fae05e3b54091406ba
2021-09-18 16:56:46 +00:00
Bill Yi
046b236eb8
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f8e6f5ed67
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860609
Change-Id: Ic1878ab40b862c9be53cf9c54b83efc8f067bcbe
2021-09-18 16:53:22 +00:00
Bill Yi
f8e6f5ed67
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I857dbb19de761131c3c03de7be457f69b01b29d4
2021-09-18 16:53:09 +00:00
Wesley.CW Wang
3f7839cad0
Add PowerSaveWhitelistExceptIdle as Optimizted modes condition
...
- Check PowerSaveWhitelistExceptIdle list before update each apps
optimizaton mode to avoid duplicate remove action
- Make those apps which under PowerSaveWhitelistExceptIdle list keep at
optimized mode only
BYPASS_INCLUSIVE_LANGUAGE_REASON=legacy naming, not edit by this code change
Bug: 199892006
Test: make SettingsRoboTests
Change-Id: I3cd10cf51b5132fc12a83e9554801ec4e8578cd1
2021-09-17 18:38:01 +00:00