Commit Graph

95708 Commits

Author SHA1 Message Date
Bill Yi
1699e1c4dc Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-mainline-prod am: 0f47b7af50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: I33e0591c900b057dcdfb9b7b17ecb1cd21aa8f59
2021-09-03 20:54:35 +00:00
Bill Yi
db93d62434 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-dev-plus-aosp am: 097d024fe5 am: 9c5164530c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: Ib61918d30da3b106ac21055cfe8a87f5e5a883f9
2021-09-03 20:54:32 +00:00
Bill Yi
249b452404 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 78c0f840f7 -s ours am: d741fbde5c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id616fe6338df8087954d3a3e61e568dd6168b937
2021-09-03 20:54:32 +00:00
Bill Yi
9c5164530c Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-dev-plus-aosp am: 097d024fe5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: Iad06b7fa9b9d504a235ec489542831c10fee0393
2021-09-03 20:54:16 +00:00
Bill Yi
d741fbde5c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 78c0f840f7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia25e93ab78d1d7fcafe05456bdc99335a8693e1b
2021-09-03 20:54:15 +00:00
Automerger Merge Worker
eb875dacc7 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours am: b33a9e9bca -s ours am: b0f2b985f2 -s ours" into sc-v2-dev-plus-aosp 2021-09-03 20:54:13 +00:00
TreeHugger Robot
474e1253fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours am: 20a3a9ac3d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5b4c4cb3942739374ab825a4685199ff633c3098
2021-09-03 20:54:11 +00:00
Bill Yi
7f3dafa6fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours am: b33a9e9bca -s ours am: b0f2b985f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I64f4801397ea61aa128b4a8ce2c40a21fcf81fc6
2021-09-03 20:54:11 +00:00
Bill Yi
2e539bf197 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours am: b33a9e9bca -s ours am: 4277c065af -s ours
am skip reason: subject contains skip directive

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

Change-Id: I048dc32abd0644fbb46c43718f5a7eb6771cc01c
2021-09-03 20:54:09 +00:00
Bill Yi
ecfab9c464 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours am: 9df033b383 -s ours am: b5590eddc6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6998b87859c5ca6448306c370dca381cf2152d75
2021-09-03 20:53:49 +00:00
Bill Yi
615fe425a8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-09-03 20:36:09 +00:00
Bill Yi
70874add3d Merge changes from topic "presubmit-am-fbaf42d576fe4523a7eac2ea16e462b2"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a40d069943
  Import translations. DO NOT MERGE ANYWHERE
2021-09-03 20:36:09 +00:00
Bill Yi
088b27084b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-09-03 20:35:56 +00:00
Bill Yi
dddb3de15b Merge changes from topic "presubmit-am-8ab7759faf5046109c391673b7566e8f"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c6f7519a06
  Import translations. DO NOT MERGE ANYWHERE
2021-09-03 20:35:56 +00:00
Bill Yi
6178db1a47 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-03 20:35:13 +00:00
Bill Yi
aa77dc6ebb Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820
  Import translations. DO NOT MERGE ANYWHERE
2021-09-03 20:35:13 +00:00
Bill Yi
a7002a5a80 Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820
  Import translations. DO NOT MERGE ANYWHERE
2021-09-03 20:35:13 +00:00
Bill Yi
46a1f58755 Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820
  Import translations. DO NOT MERGE ANYWHERE
2021-09-03 20:35:13 +00:00
Bill Yi
be3e82fa16 Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 2p: 0345842b51
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820
  Import translations. DO NOT MERGE ANYWHERE
2021-09-03 20:35:13 +00:00
Bill Yi
0660fbec64 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
  Import translations. DO NOT MERGE ANYWHERE
2021-09-03 20:34:05 +00:00
Bill Yi
a8c5a69b8d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-03 20:34:05 +00:00
Bill Yi
0f47b7af50 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
  Import translations. DO NOT MERGE ANYWHERE
2021-09-03 20:34:05 +00:00
Bill Yi
097d024fe5 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
  Import translations. DO NOT MERGE ANYWHERE
2021-09-03 20:34:05 +00:00
Bill Yi
0b23e3d0ae Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 2p: 3c592eda3e
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
  Import translations. DO NOT MERGE ANYWHERE
2021-09-03 20:34:05 +00:00
Bill Yi
4277c065af [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours am: b33a9e9bca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I74e65cf7d7c7fea59dca0652d56ea6b8f25ef1f0
2021-09-03 20:24:01 +00:00
Bill Yi
b0f2b985f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours am: b33a9e9bca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I45e89df28a0955ea1b3b854c393c09c8083ad991
2021-09-03 20:23:32 +00:00
Bill Yi
338683dd86 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours am: 729b22ab1a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9ed7d8c92154a6e67539cec9ce4eae3dcfa2a94e
2021-09-03 20:22:50 +00:00
TreeHugger Robot
20a3a9ac3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I21533a0770fa30d42849b0ed39e6d21c3651a4a0
2021-09-03 20:22:37 +00:00
Bill Yi
b5590eddc6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours am: 9df033b383 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I88fc59da6b8457a4e93d25d7a41ab26b03af6364
2021-09-03 20:22:29 +00:00
TreeHugger Robot
8151478da6 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-09-03 20:11:45 +00:00
Bill Yi
b33a9e9bca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ida46ec1fe7ee8f08e606a823761b80da7f217d1a
2021-09-03 20:06:28 +00:00
Bill Yi
729b22ab1a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee05cb245cac65f158837831a38a7ee8f8b4bf53
2021-09-03 20:05:26 +00:00
Bill Yi
9df033b383 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic31a5b9d69690b2df25a695cfbc30d5a064d5baf
2021-09-03 20:04:35 +00:00
TreeHugger Robot
a08ae6df50 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-09-03 20:03:25 +00:00
Bill Yi
fcec6efb01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I829fa5fbd3cc0525bcf3819e6c499d57c278110d
2021-09-03 19:55:43 +00:00
TreeHugger Robot
22787df2a2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: 9902d7a14b -s ours am: a58f50c62c -s ours am: 4d2402d66e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2ec2858780225419eb152904726add4fa43d865c
2021-09-03 18:32:36 +00:00
TreeHugger Robot
e7e62dfdaa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: 9902d7a14b -s ours am: 5050698472 -s ours am: 6904383a97 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib6ebb440cda04d2dd1481ce12e884085481431cf
2021-09-03 18:32:25 +00:00
Bill Yi
7e88c1e732 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: 65fa976c50 -s ours am: 3e508b953b -s ours am: e2aec9cc99 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iac845ea900ee29340c2d7692f35a9bc5dbf79060
2021-09-03 18:32:09 +00:00
Bill Yi
998fe4ce7a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: 65fa976c50 -s ours am: afeeb379fd -s ours am: 85080c0d13 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie2a6b630d48281cf77086060b1180d9d5c0b81cc
2021-09-03 18:31:53 +00:00
TreeHugger Robot
13b4cfd182 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: c1074b5f62 -s ours am: 84726902c0 -s ours am: 85f98b37ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0f0d9dd216b1feb1aab42928ff8ca602b5cc104
2021-09-03 18:31:12 +00:00
Bill Yi
20d6ddf090 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: a8d332257c -s ours am: 89891e1ccc -s ours am: 835b2ec21a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5aa5b408d3e37df6fb468ce56282a9449fb94cc2
2021-09-03 18:28:26 +00:00
TreeHugger Robot
4d2402d66e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: 9902d7a14b -s ours am: a58f50c62c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0052c3c8972ba2f53f74ecbd78d4ff775089cf0b
2021-09-03 18:19:09 +00:00
TreeHugger Robot
6904383a97 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: 9902d7a14b -s ours am: 5050698472 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5da6aa94fa3eca190ff5a35e942b8499dce8b5b
2021-09-03 18:14:34 +00:00
Bill Yi
e2aec9cc99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: 65fa976c50 -s ours am: 3e508b953b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1c3df4ec6631c66a5f15175fffd3f5a6ab0f4228
2021-09-03 18:14:12 +00:00
Bill Yi
85080c0d13 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: 65fa976c50 -s ours am: afeeb379fd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia3ec8797689ea8902209a0a77efd437f060f0cd6
2021-09-03 18:13:13 +00:00
TreeHugger Robot
85f98b37ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: c1074b5f62 -s ours am: 84726902c0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I32fb1d6b73966f4288327f71bbdc6b7fd0dece71
2021-09-03 18:10:15 +00:00
Bill Yi
835b2ec21a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: a8d332257c -s ours am: 89891e1ccc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I996f85857e627e964eef060eedb75e5ad49b4b8f
2021-09-03 18:07:36 +00:00
TreeHugger Robot
a58f50c62c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: 9902d7a14b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7d74ba2fdb89b6c74b8d752c7db124341c5eeb36
2021-09-03 17:53:46 +00:00
TreeHugger Robot
5050698472 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: 9902d7a14b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I57980dcaf54f815017641c6adb7a39a8be55838d
2021-09-03 17:53:42 +00:00
Bill Yi
3e508b953b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: 65fa976c50 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2cd97c62e9315366b425d9e50c6320cdb2a90267
2021-09-03 17:53:37 +00:00