Commit Graph

94774 Commits

Author SHA1 Message Date
Bill Yi
cfa2baf197 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours am: e183f5a054 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2ae81087d4799078266bf773ecf8e2052e12eb19
2021-09-03 20:57:32 +00:00
TreeHugger Robot
7c189c31fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours am: 20a3a9ac3d -s ours am: 0c0b1bf900 -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: Iad35c50c9031283d3d8f6bfdbd0e784ec0bffc67
2021-09-03 20:57:31 +00:00
Bill Yi
75de94bcb9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 615fe425a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3f5dbc5b31cffbc5ad476afc8d5fe564717c4731
2021-09-03 20:57:28 +00:00
Bill Yi
ec8b0cc8ad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d -s ours am: a4512d2431 -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: I71305eb53cd4a496c0bc5a281cf58cb709d87a8d
2021-09-03 20:57:24 +00:00
Bill Yi
61af3ca025 Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-qpr1-dev am: aa77dc6ebb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126

Change-Id: I0c4ebf5f1ddc29321e473eeb8147dcc6e569a3fe
2021-09-03 20:57:06 +00:00
Bill Yi
08d52721f9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 am: 914dc714a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae70243bc2627f6a5947c02f3f6dd8b706cf1ca4
2021-09-03 20:57:05 +00:00
Bill Yi
516823e59e Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-qpr1-dev am: aa77dc6ebb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126

Change-Id: I3785da807138232c50a73c9ac6ef296f19c9adc2
2021-09-03 20:57:01 +00:00
Bill Yi
ec49cd0182 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 am: 914dc714a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c5ee2d9be3458991e2e5130a302d0e6d8d08641
2021-09-03 20:57:00 +00:00
Bill Yi
c134de54bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 088b27084b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ied68ca1769fdd1c63eff6731c5fef5a8e5a227f9
2021-09-03 20:56:41 +00:00
TreeHugger Robot
977c1d696d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours am: 20a3a9ac3d -s ours am: 871ba0bacd -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: I723b3bc16316fa8a3e84788763171f2a25f66338
2021-09-03 20:56:13 +00:00
Bill Yi
790491bc0f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2fff9127a356f4942996e07da5ecc57d9b60bd92
2021-09-03 20:56:02 +00:00
Bill Yi
f51b63cfb0 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: I16f4670c8a3fdaa8b3bc06bfa6d4dbf712c6b210
2021-09-03 20:56:02 +00:00
Bill Yi
e7f4e52031 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 8b34aa6114 -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: Id27003c39116a7f842bc31ccf037b48b587b6778
2021-09-03 20:56:00 +00:00
Bill Yi
e49c8b9929 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d -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: I81ecebfcb12ac6b2909fad8999e83c22a9cae361
2021-09-03 20:55:53 +00:00
Bill Yi
1884eb3fb0 Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-mainline-prod am: a7002a5a80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126

Change-Id: Ifb93248b6511d087ae6f2ae052ae85266340c65d
2021-09-03 20:55:48 +00:00
Bill Yi
e183f5a054 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie81fba7f2c1f2de6a35d4e83919474b1c43819fc
2021-09-03 20:55:47 +00:00
Bill Yi
f897c41728 Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-dev-plus-aosp am: 46a1f58755
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126

Change-Id: If9f697a82c13be2aa1460620e21c4ff320912f89
2021-09-03 20:55:47 +00:00
Bill Yi
1996b1c872 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 am: fefa801325 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1dd6a6351f37de8e2dd0d85d57d28cce932de93d
2021-09-03 20:55:47 +00:00
Bill Yi
a87573a588 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: I49900fb9eb356739642c89c568fc64cc28e2d1c2
2021-09-03 20:55:45 +00:00
Bill Yi
af37131dd0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 8b34aa6114 -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: I9cb5efcd328f63618808b24111a0dc86bad57b42
2021-09-03 20:55:44 +00:00
Bill Yi
a4512d2431 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d -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: Idcd291d6f5de8bb470df5b33500429d37352e9de
2021-09-03 20:55:42 +00:00
TreeHugger Robot
871ba0bacd [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: I48291282e1ad8e0f48096f582780069ab4107380
2021-09-03 20:55:29 +00:00
TreeHugger Robot
0c0b1bf900 [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: If1a90ba04044295d8653a1b3b3ce9e86b4c4d3cc
2021-09-03 20:55:01 +00:00
Bill Yi
f1d1dea725 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3e187054e6c573664edbb192171fc6a8a8e7835c
2021-09-03 20:54:46 +00:00
Bill Yi
91f5a9be02 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d -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: I2fbf37460a4ea3d67c6431251c1f9c13d99781b4
2021-09-03 20:54:40 +00:00
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