Commit Graph

95708 Commits

Author SHA1 Message Date
Bill Yi
cd6055bb3c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 85a9e657e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b38971c5d426118153b769987c96f56adabba96
2021-08-29 20:20:31 +00:00
Bill Yi
5e733c2078 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2d6a17b989 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8639a0ed084cda53561959cb9b9a89d130712623
2021-08-29 20:20:21 +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
fa54b86b5a Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-mainline-prod
* 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
19d44a4e77 Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 2p: c93e98fb75
  [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
Bill Yi
301c3365ac Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-mainline-prod
* 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
ccedc8a184 Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 2p: 6eddd0869b
  [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
85a9e657e4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-08-29 20:08:34 +00:00
Bill Yi
dddf85ea44 Merge changes from topic "presubmit-am-dc428f658bfc4a758c94950b08eef3a0"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f73ff37faa
  Import translations. DO NOT MERGE ANYWHERE
2021-08-29 20:08:34 +00:00
Bill Yi
2d6a17b989 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-08-29 20:04:40 +00:00
Bill Yi
a686f61c5d Merge changes from topic "presubmit-am-914c2ea73abe40e7b11ba4ed6e1413d5"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ef02a83e5b
  Import translations. DO NOT MERGE ANYWHERE
2021-08-29 20:04:40 +00:00
TreeHugger Robot
59bd1e1e9e [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: 1e55cbb986 -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: Ifb6ec97a0d305eddf9ec0b90c3f00753b6c5a9ea
2021-08-28 09:39:03 +00:00
TreeHugger Robot
ccf14a81f1 [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: ff010b5803 -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: If497362cf64bd3913935f9a3917c76f3d2e98693
2021-08-28 09:38:57 +00:00
Bill Yi
8ca3f82d0f [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: a4941628ca -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: I6cd7eede1d4f16a839cc607cd2e40964c4a615fd
2021-08-28 09:38:51 +00:00
TreeHugger Robot
765f0fb644 [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: f5d4c86181 -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: Ieab5ea89e9b536f4a146f00ec0929495c3631aa6
2021-08-28 09:38:41 +00:00
TreeHugger Robot
9d224c5f37 [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: 264f44f1d8 -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: Id20f98dae4a9495e0f942fa4594bb0fcb9a55e7c
2021-08-28 09:38:23 +00:00
Bill Yi
55cff7a930 [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: c50fb357fd -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: Iff530d36672193f08be9f54cc338219a615de3b0
2021-08-28 09:37:36 +00:00
Bill Yi
e9639eff5a [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: 3ee3941e8a -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: Ida907f144a4e912b1f01f29de369f7155e6564ae
2021-08-28 09:33:51 +00:00
Bill Yi
0e78046c88 [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: 5bec5f8ddf -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: I88a5a9eacaa2d9656c18e61974a9b798166cb135
2021-08-28 09:32:51 +00:00
TreeHugger Robot
0c2e65d437 [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: 71e82b93bc -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: I2013ad97ec5d3f4360d2b080283c3e298a86c326
2021-08-28 09:32:09 +00:00
TreeHugger Robot
256fa35ee0 [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: 4627d8482b -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: I60ee02485bbfcf7499da5ffd9760b181bfebdf7d
2021-08-28 09:31:09 +00:00
Bill Yi
49c2564cc9 [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: 683aa8cf54 -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: I1fd218e37b51fac96bfb541b69fc9141f53ab344
2021-08-28 09:29:56 +00:00
Bill Yi
8dd4c9b605 [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: f69c48e74f -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: I2ceaea7dbedb39f84c6ca1c6d3da4d8a2b8d3200
2021-08-28 09:28:33 +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
TreeHugger Robot
959174c5ff [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 skip reason: subject contains skip directive

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

Change-Id: I74d322b0d18a9b0efa5f0cd253f4631d2c4e5dbe
2021-08-28 08:53:08 +00:00
TreeHugger Robot
33e66c57fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4c1ee5ab6a -s ours am: 4d7546b098 -s ours am: 6dd698f411 -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: Ia523d111aae04ab79b1194f433bee1c8f18c6767
2021-08-28 08:52:59 +00:00
Bill Yi
bed3d381ab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af04cc6ba7 -s ours am: 3ff9a07c89 -s ours am: cec1d12392 -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: I579384f64ab19ad324795652e9ad87221631ff3f
2021-08-28 08:52:58 +00:00