Commit Graph

87665 Commits

Author SHA1 Message Date
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
Bill Yi
a4941628ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af04cc6ba7 -s ours am: 3ff9a07c89 -s ours am: eb2a13ee8a -s ours am: 342cfa07ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I457fd09d3d6d8cfc9cce54070cf4f39dbcf128de
2021-08-28 09:15:33 +00:00
TreeHugger Robot
f5d4c86181 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4c1ee5ab6a -s ours am: 4d7546b098 -s ours am: 80725024e0 -s ours am: 5b9b7e1402 -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: I9724ea014f0df5be665ebd9aa788545837f7b477
2021-08-28 09:15:28 +00:00
TreeHugger Robot
264f44f1d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 41642f5ba8 -s ours am: c60b803327 -s ours am: e8c88b9a3d -s ours am: 959174c5ff -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: I38d0770b1b1f6c46ddee0abd5eee2cae97786e0d
2021-08-28 09:15:20 +00:00
Bill Yi
c50fb357fd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af04cc6ba7 -s ours am: 3ff9a07c89 -s ours am: cec1d12392 -s ours am: bed3d381ab -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9b707d7694872b0a28ef38b7819b3b8f2802af4f
2021-08-28 09:14:26 +00:00
Bill Yi
3ee3941e8a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be9d9c91bd -s ours am: 118a531c2c -s ours am: 9b3d8a4629 -s ours am: a61ce89164 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I334f0230dd1aa0653675b356170d03796a51febc
2021-08-28 09:13:54 +00:00
Bill Yi
5bec5f8ddf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be9d9c91bd -s ours am: 118a531c2c -s ours am: 2d8f65e4f8 -s ours am: 9c4c7980a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I522a5d453f0a860a26b14a2f910d296fe3c7f604
2021-08-28 09:13:18 +00:00
TreeHugger Robot
71e82b93bc [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: 6d456b0b25 -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: I7871572c360fda1306a7d5b5a1a10c3a6a2575e0
2021-08-28 09:09:45 +00:00
TreeHugger Robot
4627d8482b [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: 6080141498 -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: I34f746844e5764aec4516abe79739245b764f06c
2021-08-28 09:09:29 +00:00
Bill Yi
683aa8cf54 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af04cc6ba7 -s ours am: 3ff9a07c89 -s ours am: eb2a13ee8a -s ours am: 19cbb3c570 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8b170e3b4c2240f0c0ded934d31ae33f2c287efe
2021-08-28 09:09:20 +00:00
Bill Yi
f69c48e74f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be9d9c91bd -s ours am: 118a531c2c -s ours am: 9b3d8a4629 -s ours am: 5a0fe94bbf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8014c5de48defc7298e39cd10a937a962f94e0e6
2021-08-28 09:08:59 +00:00
TreeHugger Robot
6d456b0b25 [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 skip reason: subject contains skip directive

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

Change-Id: I43e095b6d9e481e0c702b696a1a4fd0c1cb5e4ab
2021-08-28 08:53:38 +00:00
TreeHugger Robot
6080141498 [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 skip reason: subject contains skip directive

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

Change-Id: I51f0e6efaecb90ced00b9d0c2d4356d477f113f1
2021-08-28 08:53:32 +00:00
TreeHugger Robot
f330ceb0b9 [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 skip reason: subject contains skip directive

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

Change-Id: I83103223e708fd651e29df4484695c6ad683619c
2021-08-28 08:53:29 +00:00
TreeHugger Robot
e209ead577 [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 skip reason: subject contains skip directive

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

Change-Id: I95097604733d9c0ef41de3727e276f4063afb0e8
2021-08-28 08:53:22 +00:00
Bill Yi
342cfa07ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af04cc6ba7 -s ours am: 3ff9a07c89 -s ours am: eb2a13ee8a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2a0ccb5696b2454366e91179378686d84b400a03
2021-08-28 08:53:18 +00:00
TreeHugger Robot
5b9b7e1402 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4c1ee5ab6a -s ours am: 4d7546b098 -s ours am: 80725024e0 -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: I3d08eedc7b32b8903c5336334ab92d49334f2221
2021-08-28 08:53:16 +00:00
Bill Yi
19cbb3c570 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af04cc6ba7 -s ours am: 3ff9a07c89 -s ours am: eb2a13ee8a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I176101090958db799d7db5670ba01b922b3ab391
2021-08-28 08:53:13 +00:00