Commit Graph

95192 Commits

Author SHA1 Message Date
Bill Yi
cb4022a78b Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev am: fb733b7d84 am: 5f9d29ac41 am: 2e67fd2b8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621

Change-Id: Icf4d434612d3424f6a50ef038ea322caa1c04e07
2021-09-20 13:59:27 +00:00
Bill Yi
4e7b6ed0e5 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed am: 13cb0a15ca -s ours am: ae2e00e1d0 -s ours am: 7dcbfbd0d9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0b4f93cae42f4ffd0c1c08bc879303c6156682ff
2021-09-20 13:59:26 +00:00
Bill Yi
3fd3850821 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530 -s ours am: 2cf7817de7 -s ours am: 78507d697d -s ours am: 65992373b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0a223de47ad513cbb4f07620f225f71af9669fb8
2021-09-20 13:59:10 +00:00
Bill Yi
e0616317af Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-dev-plus-aosp am: 6bff29a287 am: 24dabad62e am: aa7a1362e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617

Change-Id: Id64d3549e7646c34f137e8758da6e521f5ba6daf
2021-09-20 13:58:46 +00:00
Bill Yi
a7add5dbee [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643 am: 6c50635319 -s ours am: 39f5c07a46 -s ours am: 10f66958a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ied165641ab5f45947e98a8a1315c95dc02732752
2021-09-20 13:58:45 +00:00
Bill Yi
43ca32d28f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed am: 15c729b335 -s ours am: 7159a65e51 -s ours am: a8bb61fd6a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I83756328848ffdbb41df14ea28a1b58e2fb63dc3
2021-09-20 13:58:03 +00:00
Bill Yi
2e67fd2b8d Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev am: fb733b7d84 am: 5f9d29ac41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621

Change-Id: I94a33ea0836cd8d8767ce12535bb8d55cf0403fe
2021-09-20 13:43:05 +00:00
Bill Yi
7dcbfbd0d9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed am: 13cb0a15ca -s ours am: ae2e00e1d0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ida492582a2d3265ab453094ff4aafd6843b19dca
2021-09-20 13:43:04 +00:00
Bill Yi
65992373b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530 -s ours am: 2cf7817de7 -s ours am: 78507d697d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icfee5270bc38a5372ec171486ea9189163515d70
2021-09-20 13:42:58 +00:00
Bill Yi
aa7a1362e2 Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-dev-plus-aosp am: 6bff29a287 am: 24dabad62e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617

Change-Id: I30d247182b1fbfbee142eef5e5f80ccfa41099cb
2021-09-20 13:42:53 +00:00
Bill Yi
10f66958a3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643 am: 6c50635319 -s ours am: 39f5c07a46 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iecad8a37cb6eaaa1f1cb996f300c48eb106be272
2021-09-20 13:42:52 +00:00
Bill Yi
a8bb61fd6a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed am: 15c729b335 -s ours am: 7159a65e51 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08ff54fe6b23a7de05276260eb921c4943be56e7
2021-09-20 13:42:34 +00:00
Bill Yi
5f9d29ac41 Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev am: fb733b7d84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621

Change-Id: I0d7994d278d45ea2d17791b4824a46e062cb0751
2021-09-20 13:29:08 +00:00
Bill Yi
ae2e00e1d0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed am: 13cb0a15ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I067a00a8909307ae3f52c431d4d9507d286882d1
2021-09-20 13:29:05 +00:00
Bill Yi
78507d697d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530 -s ours am: 2cf7817de7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4848bbfd71eb759d93bb59620ccb0fc719d97f67
2021-09-20 13:28:52 +00:00
Bill Yi
24dabad62e Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-dev-plus-aosp am: 6bff29a287
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617

Change-Id: Ic3ded16601c92a03262dd117d7e6eed2d002eecb
2021-09-20 13:28:48 +00:00
Bill Yi
39f5c07a46 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643 am: 6c50635319 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iddace0681dfb896a08d5f4180f79371d4b5ceaaf
2021-09-20 13:28:47 +00:00
Bill Yi
7159a65e51 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed am: 15c729b335 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I49a5b608f3c33a6aa74a95d39bcf674cafbfc6c7
2021-09-20 13:28:37 +00:00
Bill Yi
271538063b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530 -s ours am: 7ae69a606a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I023652d879e127ac50a50c006f59c244e34ea02a
2021-09-20 13:28:32 +00:00
Bill Yi
fce069bc7d Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-mainline-prod am: dc217a8213
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617

Change-Id: I2daeffe1ff82dde50ff92065d3fceb5b0fffe84b
2021-09-20 13:28:27 +00:00
Bill Yi
0af9eabf24 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8d5d3dc1af -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia27698d997bb7b023c1243de969cb20071f12bab
2021-09-20 13:28:17 +00:00
Bill Yi
394718aad0 Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-mainline-prod am: 60b7cbbd6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621

Change-Id: I3ec654d5243aacf855222ed724702e73aa288ff3
2021-09-20 13:28:10 +00:00
Bill Yi
7ae69a606a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba79df6ba63d3474996c68b78e8786f2b4b3274f
2021-09-20 13:28:03 +00:00
Bill Yi
2cf7817de7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I89cb67f37af3095da61f90fe665e6814bd592dfe
2021-09-20 13:27:54 +00:00
Bill Yi
6bff29a287 Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
  Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:13:42 +00:00
Bill Yi
dc217a8213 Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
  Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:13:42 +00:00
Bill Yi
a9b7463e6d Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643 2p: a0633f5acf
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
  Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:13:42 +00:00
Bill Yi
66375d4530 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-20 13:13:42 +00:00
Bill Yi
8d5d3dc1af Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-09-20 13:13:04 +00:00
Bill Yi
cf8ea19226 Merge changes from topic "presubmit-am-4767d054095942768d54a95ec7cc02ab"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d06e16aba1
  Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:13:04 +00:00
Bill Yi
fb733b7d84 Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
  Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:12:43 +00:00
Bill Yi
60b7cbbd6b Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
  Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:12:43 +00:00
Bill Yi
bbfe69ace0 Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed 2p: 2d17d8bc0b
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
  Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:12:43 +00:00
Bill Yi
567de5c29b Merge changes from topic "presubmit-am-649569b5abc842e09efe1b7b36c3b10b"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f8e6f5ed67
  Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:12:30 +00:00
TreeHugger Robot
333f4503da [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: e9200b19ad -s ours am: 59657f177e -s ours am: 02a77829b2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib777b549e188cf9cbd0010157a7475665abe3407
2021-09-20 06:50:58 +00:00
Bill Yi
66da57bccb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 918492ab2a -s ours am: a5e8168fba -s ours am: a78dd639be -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f34f7ca239366bc850a7671405d15e6e2fb223c
2021-09-20 06:50:38 +00:00
TreeHugger Robot
a9627c5f2e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: e9200b19ad -s ours am: 497e2a9ef1 -s ours am: 5dc558bf34 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9e9a7f24bda60ad061116b4e01738702f85a1b2a
2021-09-20 06:49:55 +00:00
Bill Yi
60c9e639f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 918492ab2a -s ours am: 3d70903686 -s ours am: 7d85761778 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iea0d8cbd141703ee950b425216d963e3b079de84
2021-09-20 06:49:08 +00:00
TreeHugger Robot
599e8a30f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: ab040df5fe -s ours am: ae7abb19af -s ours
am skip reason: subject contains skip directive

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

Change-Id: I014f9d13b52f4e6d91849b03805eb5dcc14bd777
2021-09-20 06:48:28 +00:00
TreeHugger Robot
02a77829b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: e9200b19ad -s ours am: 59657f177e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I977819a7838da29d7bb06066a49653101153614d
2021-09-20 06:47:35 +00:00
Bill Yi
1b9e03bd01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2f0cdea1f -s ours am: 69668617dc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id34e6632c0dca43ef2538c1a3f81e3f33a7c3e05
2021-09-20 06:47:26 +00:00
Bill Yi
a78dd639be [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 918492ab2a -s ours am: a5e8168fba -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0a3e4ecee84b8d9cf4e9157a6edff726df54858d
2021-09-20 06:47:23 +00:00
TreeHugger Robot
5dc558bf34 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: e9200b19ad -s ours am: 497e2a9ef1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I54208f11995b7bf244fabd07edc9bcfa8b9e1c92
2021-09-20 06:36:38 +00:00
Bill Yi
7d85761778 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 918492ab2a -s ours am: 3d70903686 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I04f5196c5d47327b9f38345f2ecb08cf3599dd3b
2021-09-20 06:36:21 +00:00
TreeHugger Robot
ae7abb19af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: ab040df5fe -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id54a2607c1c320aff3cb10626858d8fab7dbf5f0
2021-09-20 06:35:56 +00:00
TreeHugger Robot
497e2a9ef1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: e9200b19ad -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8b80fcff9238db87538f802cf2513982c40cac4b
2021-09-20 06:35:17 +00:00
Bill Yi
69668617dc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2f0cdea1f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifd5b519f6e608937c0a18b7b3c5f3bfe7e353cce
2021-09-20 06:34:40 +00:00
Bill Yi
3d70903686 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 918492ab2a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idebf6803d8b02897c85ede92394b94a563089065
2021-09-20 06:34:35 +00:00
TreeHugger Robot
59657f177e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: e9200b19ad -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0cf70cd38b40f5ff2a3cbec48ee1dde252628b6c
2021-09-20 06:34:10 +00:00
Bill Yi
a5e8168fba [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 918492ab2a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I393b0d96d51a639aa387212c41c69a7a1d39dac9
2021-09-20 06:33:49 +00:00