Commit Graph

94774 Commits

Author SHA1 Message Date
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
b53d0089cb [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: I9da0107bd11e76ba1e158b1fa48b5b04a007a042
2021-08-29 20:28:13 +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
cc19de6420 [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: Ie7b0ce43ba4601703df172dcb9113e364678484b
2021-08-29 20:27:03 +00:00
Bill Yi
7d32928609 Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-mainline-prod am: fa54b86b5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667

Change-Id: Id2fa793f3eabd8806acedbb5e35fe9719b17a79d
2021-08-29 20:20:52 +00:00
Bill Yi
f447ed5d64 Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-mainline-prod am: 301c3365ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678

Change-Id: I6db5278c32906ce25f83697b1f2bab85bd4abcb8
2021-08-29 20:20:42 +00:00
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