Commit Graph

94681 Commits

Author SHA1 Message Date
Bill Yi
234a108ae9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 am: 914dc714a2 -s ours am: ec49cd0182 -s ours am: 56eb2c3a2d -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: If5b7d3ab4c73b4a09cb96a1748a53f5333389cda
2021-09-03 21:13:01 +00:00
Automerger Merge Worker
80d89d3408 Merge changes from topic "am-4518399b59a1469084ce724347b5bde1" into sc-v2-dev-plus-aosp am: cf02f67258
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: Iefe58b52b3c1b9f1a9046a408d790859960b4b00
2021-09-03 21:12:42 +00:00
Bill Yi
3967674e06 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 8b34aa6114 -s ours am: e7f4e52031 -s ours am: 441f770ddd -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: Iced857572e225545e8399a6444ecec7f74399d78
2021-09-03 21:12:39 +00:00
Bill Yi
1ac50d69bf Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64 am: a87573a588 am: 740cc82a19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: I83eaf234db994f34dbdedfe95494f198e648190a
2021-09-03 21:12:25 +00:00
Bill Yi
f785d4d5d6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 8b34aa6114 -s ours am: af37131dd0 -s ours am: 558125edee -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: Ia18d8d7aea69f6b8e1bec6af5b227856b8976705
2021-09-03 21:12:24 +00:00
Bill Yi
d50ce7312e Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-dev-plus-aosp am: 46a1f58755 am: f897c41728 am: 1b80b5addd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126

Change-Id: Idd9f43952260ee02146706f134170413e583b2aa
2021-09-03 21:12:03 +00:00
Bill Yi
e19608c63c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 am: fefa801325 -s ours am: 1996b1c872 -s ours am: 25394809bc -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: I8456bc38c15be49d88f32245f5ab1a2b3ab44905
2021-09-03 21:12:02 +00:00
Bill Yi
30836cba59 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-dev-plus-aosp am: 097d024fe5 am: 9c5164530c am: db93d62434
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: I5a8ae634a6dd6c15b0f953e3bd9bf33ae4816fd0
2021-09-03 21:11:43 +00:00
Bill Yi
ee5bfb5b34 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 78c0f840f7 -s ours am: d741fbde5c -s ours am: 249b452404 -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: I8d0cd1cae6778a518b8f034dfb41f2d6089f9d94
2021-09-03 21:11:40 +00:00
Automerger Merge Worker
47e152feab 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 am: eb875dacc7 -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: Icb8a490d347095db718026bc7c612ca10b2155e6
2021-09-03 21:10:45 +00:00
Bill Yi
450448f262 [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: 2e539bf197 -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: I64890976ae4db572e2fab429569d4525b07bff0f
2021-09-03 21:10:16 +00:00
Bill Yi
3530f0e194 [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: ecfab9c464 -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: Ifa8ed853797298f535b41b5c91b794d7bbe1c8aa
2021-09-03 21:09:41 +00:00
Bill Yi
56eb2c3a2d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 am: 914dc714a2 -s ours am: ec49cd0182 -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: I9e4972edd3673d6eec8492378bfcf2068a6ba258
2021-09-03 20:59:10 +00:00
Automerger Merge Worker
cf02f67258 Merge changes from topic "am-4518399b59a1469084ce724347b5bde1" into sc-v2-dev-plus-aosp
* changes:
  Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64 am: f51b63cfb0
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 8b34aa6114 -s ours am: e7f4e52031 -s ours
2021-09-03 20:59:04 +00:00
Bill Yi
3ebb9a2928 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64 am: f51b63cfb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: Ic85ab08e0d7b9303b6990921837f3866fbe0c1a6
2021-09-03 20:59:03 +00:00
Bill Yi
441f770ddd [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 8b34aa6114 -s ours am: e7f4e52031 -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: I930321ed8ba8c59ab1e30c517298309d70421227
2021-09-03 20:59:02 +00:00
Bill Yi
740cc82a19 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64 am: a87573a588
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: Ia6fb3dc66c83dd6908012265d74700bf4853ee05
2021-09-03 20:59:01 +00:00
Bill Yi
558125edee [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 8b34aa6114 -s ours am: af37131dd0 -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: I5b0e285ff5bb09c89ed102af84f909cbb4e3fbe7
2021-09-03 20:58:59 +00:00
Bill Yi
1b80b5addd Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-dev-plus-aosp am: 46a1f58755 am: f897c41728
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126

Change-Id: Idc6d5a64995653b3cc2cc8dd8af696882442d91e
2021-09-03 20:58:48 +00:00
Bill Yi
25394809bc [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 am: fefa801325 -s ours am: 1996b1c872 -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: I43d03bed0e02194bbd5581201ede2798cec8231a
2021-09-03 20:58:47 +00:00
Bill Yi
6d7d9cf58d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours am: f1d1dea725 -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: I9d727cf280a6460fe49d492e2df2cd22f0eeca7c
2021-09-03 20:57:56 +00:00
Bill Yi
8c7dab4d60 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d -s ours am: 91f5a9be02 -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: Iccff5b49543c29c43effabec39c3547346c12c80
2021-09-03 20:57:51 +00:00
TreeHugger Robot
3286e5d5a7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours am: 20a3a9ac3d -s ours am: 474e1253fd -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: I2872580faec04c7fe69502749c1f2a2f27307c57
2021-09-03 20:57:45 +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
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
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
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
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
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
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