Commit Graph

94394 Commits

Author SHA1 Message Date
TreeHugger Robot
0b12207ac2 Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev am: ea4e5a33bf am: 8157ef107a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15635257

Change-Id: I8793f955db5a58398cf4391eefeccb43c658abe8
2021-08-20 11:22:34 +00:00
TreeHugger Robot
701b89a3b9 Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev am: ea4e5a33bf am: ef2c734413
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15635257

Change-Id: Ibc897838a3d068d718df8be06e5ccd6b3925dbdd
2021-08-20 11:22:09 +00:00
TreeHugger Robot
8157ef107a Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev am: ea4e5a33bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15635257

Change-Id: I820689921ec31b567eccb16fa85675900403b208
2021-08-20 11:11:08 +00:00
TreeHugger Robot
ef2c734413 Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev am: ea4e5a33bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15635257

Change-Id: I9d2819fd3a9a043302295e8f1c6ba9d0e67c86cf
2021-08-20 11:11:08 +00:00
TreeHugger Robot
ea4e5a33bf Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev 2021-08-20 10:57:58 +00:00
Sam Chang
c4084d4141 Revert "Add sensitivity configuration to long press power dialog"
This reverts commit de2f00df41.

Reason for revert: This CL will cause build break, b/197290948

Change-Id: Ibee2d4bc5e445e863585c291b4b2741bcb4b4c81
2021-08-20 06:46:33 +00:00
YUKAI HUNG
8a51d3a749 Merge "[B&R] backup the getFullPowerWhitelist() for battery setting" into sc-v2-dev am: 5d59c685d7 am: 902ae0a655
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15611718

Change-Id: I409320cd7a991095c102ea5fab3a035c9c3e86a1
2021-08-20 02:02:15 +00:00
YUKAI HUNG
902ae0a655 Merge "[B&R] backup the getFullPowerWhitelist() for battery setting" into sc-v2-dev am: 5d59c685d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15611718

Change-Id: Ic2becc65d48bf577794578b2210152eccb59cb7c
2021-08-20 01:53:19 +00:00
YUKAI HUNG
5d59c685d7 Merge "[B&R] backup the getFullPowerWhitelist() for battery setting" into sc-v2-dev 2021-08-20 01:39:28 +00:00
ykhung
7cbc683d3e [B&R] backup the getFullPowerWhitelist() for battery setting
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: I2d5c51b5b5788d703a233f5df719a298382feb98
2021-08-19 23:59:21 +00:00
Bill Yi
b2eff26f18 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: cae8b13289 -s ours am: a131a4e35d -s ours am: 7931ff7ae4 -s ours am: 715423605d -s ours am: 583ca495e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7335dd901f41bf56f284f5715353ca82ea22ae3d
2021-08-19 20:12:01 +00:00
Bill Yi
0cb15c6d60 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: dbb7139670 -s ours am: f56033304c -s ours am: 011f12be5c -s ours am: 9105e47157 -s ours am: 225d1ed56e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I14a0fb733824430e802ed0a607b7c7da316aa048
2021-08-19 20:11:53 +00:00
Bill Yi
0f9e9e7f2e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: c748a50c90 -s ours am: de6423d2ee -s ours am: 8fd0c3d73d -s ours am: 8da46b4114 -s ours am: 8be592e130 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I36b533ac303207ae1d5ee4bbef92e6d32b102b15
2021-08-19 20:11:45 +00:00
Bill Yi
82cd7d9c3c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: 214068856c -s ours am: d46732c0d0 -s ours am: 07eddeeb3a -s ours am: abdb9265b9 -s ours am: 33f3a9afee -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9e068bc7e7764fb350b703371cd5f05b9b09f708
2021-08-19 20:11:37 +00:00
Bill Yi
3be89c94b0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: cae8b13289 -s ours am: a131a4e35d -s ours am: 7931ff7ae4 -s ours am: 8818495cfb -s ours am: f6027c5a3d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I38032b0d86ac857ea4108bdc43746c1b65f11217
2021-08-19 20:11:29 +00:00
Bill Yi
1459e4540d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: dbb7139670 -s ours am: f56033304c -s ours am: 011f12be5c -s ours am: 1d2ce0dc59 -s ours am: a42d6e2ace -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3796e5f97db54b2bc1a8bf384feacecebdef9222
2021-08-19 20:11:21 +00:00
Bill Yi
dbcc0aed02 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: c748a50c90 -s ours am: de6423d2ee -s ours am: 8fd0c3d73d -s ours am: 0c5b96da0f -s ours am: 46a5214866 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02ac932e2c2f58c6055f2697671142108b4b2a53
2021-08-19 20:11:08 +00:00
Bill Yi
4cc1bed23e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: 214068856c -s ours am: d46732c0d0 -s ours am: 07eddeeb3a -s ours am: 92e80927dd -s ours am: 130b0b0f13 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I020b51da30a76a5c158e42b4fb1d7710e95b8ba1
2021-08-19 20:10:59 +00:00
Bill Yi
9e9a5b14fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: cae8b13289 -s ours am: a131a4e35d -s ours am: 73c14fcce0 -s ours am: 5d20daf444 -s ours am: ff684ea4d1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6594686d78729ad4a021b29eb82079045d0cb8ab
2021-08-19 20:10:45 +00:00
Bill Yi
5d7a34a719 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: dbb7139670 -s ours am: f56033304c -s ours am: f39571d27c -s ours am: 386bfd3f54 -s ours am: 304a47b0c2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5449b9ff552e85f155e1328e3e072399d9bdb640
2021-08-19 20:10:36 +00:00
Bill Yi
f262e6150d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: c748a50c90 -s ours am: de6423d2ee -s ours am: 4e14188b40 -s ours am: 82067cfb6e -s ours am: 19948131b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9d6f355b2ae7156e06cd4627d1de4f9fa74935cb
2021-08-19 20:10:06 +00:00
Bill Yi
91f7c058b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: 214068856c -s ours am: d46732c0d0 -s ours am: 2e0e5306cb -s ours am: 0caa8d7dcd -s ours am: 61687b51a0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia2c1999f39106a4f2fc132138944f98d2ece17d9
2021-08-19 20:09:10 +00:00
Bill Yi
583ca495e4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: cae8b13289 -s ours am: a131a4e35d -s ours am: 7931ff7ae4 -s ours am: 715423605d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8bcaf1101f3863892831dd34a9f56c17823fccd4
2021-08-19 20:07:00 +00:00
Bill Yi
225d1ed56e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: dbb7139670 -s ours am: f56033304c -s ours am: 011f12be5c -s ours am: 9105e47157 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I867108d1cf0ea5c250760eb00270d65753b6f858
2021-08-19 20:06:53 +00:00
Bill Yi
8be592e130 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: c748a50c90 -s ours am: de6423d2ee -s ours am: 8fd0c3d73d -s ours am: 8da46b4114 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib6a1f4e90e85efa2b191e0d847a5755f10870b09
2021-08-19 20:06:48 +00:00
Bill Yi
33f3a9afee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: 214068856c -s ours am: d46732c0d0 -s ours am: 07eddeeb3a -s ours am: abdb9265b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifaa8e21ab4fbc5fb573ece413ba9c58c27d50647
2021-08-19 20:06:31 +00:00
Bill Yi
f6027c5a3d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: cae8b13289 -s ours am: a131a4e35d -s ours am: 7931ff7ae4 -s ours am: 8818495cfb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4f872601fd875dcf0a5206b71eb93d9f841928cf
2021-08-19 19:56:50 +00:00
Bill Yi
a42d6e2ace [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: dbb7139670 -s ours am: f56033304c -s ours am: 011f12be5c -s ours am: 1d2ce0dc59 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I22417b5f3d6e97c893136b6405cc4944d766e128
2021-08-19 19:56:44 +00:00
Bill Yi
46a5214866 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: c748a50c90 -s ours am: de6423d2ee -s ours am: 8fd0c3d73d -s ours am: 0c5b96da0f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibc6a9e490dafa980facb99a75bb6c5fb6d0a26d2
2021-08-19 19:56:38 +00:00
Bill Yi
130b0b0f13 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: 214068856c -s ours am: d46732c0d0 -s ours am: 07eddeeb3a -s ours am: 92e80927dd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8019e80f1c6a5d7175308c2bd2f6fdc972b3d7f6
2021-08-19 19:56:31 +00:00
Bill Yi
ff684ea4d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: cae8b13289 -s ours am: a131a4e35d -s ours am: 73c14fcce0 -s ours am: 5d20daf444 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icd5995e57a33865ac09673330c86ab786bac1324
2021-08-19 19:56:25 +00:00
Bill Yi
304a47b0c2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: dbb7139670 -s ours am: f56033304c -s ours am: f39571d27c -s ours am: 386bfd3f54 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba201cc568340b0f5277f1da3f65a59c3b919e9b
2021-08-19 19:56:18 +00:00
Bill Yi
19948131b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: c748a50c90 -s ours am: de6423d2ee -s ours am: 4e14188b40 -s ours am: 82067cfb6e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9b12cb6e9858d1b628d40f469da6e8489b02cc0b
2021-08-19 19:55:54 +00:00
Bill Yi
61687b51a0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: 214068856c -s ours am: d46732c0d0 -s ours am: 2e0e5306cb -s ours am: 0caa8d7dcd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I45eb57af6ab864c5084c8043b7c3c3aef931c079
2021-08-19 19:55:23 +00:00
Bill Yi
8818495cfb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: cae8b13289 -s ours am: a131a4e35d -s ours am: 7931ff7ae4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I31c3e1fb5e501d6135679fa211b60f72fc15ced1
2021-08-19 19:41:14 +00:00
Bill Yi
1d2ce0dc59 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: dbb7139670 -s ours am: f56033304c -s ours am: 011f12be5c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I54133487d6c5760abfdf28696fd1d5c22430b692
2021-08-19 19:41:08 +00:00
Bill Yi
715423605d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: cae8b13289 -s ours am: a131a4e35d -s ours am: 7931ff7ae4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifedac6d4e7500bc18e4006104ef59eefa16945fb
2021-08-19 19:40:58 +00:00
Bill Yi
9105e47157 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: dbb7139670 -s ours am: f56033304c -s ours am: 011f12be5c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I05036b24afa08d14a8fd06b4ec013d38c154ab0e
2021-08-19 19:40:52 +00:00
Bill Yi
8da46b4114 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: c748a50c90 -s ours am: de6423d2ee -s ours am: 8fd0c3d73d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0337590c667e2356c0268e8f194d40c2a5abfc5e
2021-08-19 19:40:47 +00:00
Bill Yi
e31759c9d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: cae8b13289 -s ours am: a131a4e35d -s ours am: 744d926374 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia7ca761e57ef9f6ad5e66868e32074fd56d8a9a0
2021-08-19 19:40:45 +00:00
Bill Yi
0c5b96da0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: c748a50c90 -s ours am: de6423d2ee -s ours am: 8fd0c3d73d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4bb784c22d9a4c0c2f519f95cb8e4f42b546d133
2021-08-19 19:40:45 +00:00
Bill Yi
7386970cfa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: dbb7139670 -s ours am: f56033304c -s ours am: d9a284c9b0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I670d05b64aad01237c30b260923c2657f70e68c0
2021-08-19 19:40:38 +00:00
Bill Yi
92e80927dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: 214068856c -s ours am: d46732c0d0 -s ours am: 07eddeeb3a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6bcd707027ac774f225c3df1a9bb9241cc76c3f3
2021-08-19 19:40:35 +00:00
Bill Yi
6211555179 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: c748a50c90 -s ours am: de6423d2ee -s ours am: 3332171452 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a5d7b0ebbc0ba3121504484c459609e3d437638
2021-08-19 19:40:31 +00:00
Bill Yi
abdb9265b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: 214068856c -s ours am: d46732c0d0 -s ours am: 07eddeeb3a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia6cf5be39bc9ffa9452dbf6a58038eaf08d71240
2021-08-19 19:40:29 +00:00
Bill Yi
56cf26770a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: 214068856c -s ours am: d46732c0d0 -s ours am: d51c0b4e15 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I06efe6804496811b8c6991273098482560ec9845
2021-08-19 19:40:21 +00:00
Bill Yi
5d20daf444 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: cae8b13289 -s ours am: a131a4e35d -s ours am: 73c14fcce0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If535820da310aaf8fd9f91fa9bb3948841a47dd8
2021-08-19 19:40:10 +00:00
Bill Yi
386bfd3f54 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: dbb7139670 -s ours am: f56033304c -s ours am: f39571d27c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie4236f7065dac61bff4bf07a0a3dadeb19f88062
2021-08-19 19:40:04 +00:00
Bill Yi
82067cfb6e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: c748a50c90 -s ours am: de6423d2ee -s ours am: 4e14188b40 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icbc8d5679cb21a6d000d146cfe13fbec92570980
2021-08-19 19:39:59 +00:00
Bill Yi
0caa8d7dcd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: 214068856c -s ours am: d46732c0d0 -s ours am: 2e0e5306cb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ief646a803bdad6cdf36bc8ef0abf18c15927a83a
2021-08-19 19:39:32 +00:00