Commit Graph

95541 Commits

Author SHA1 Message Date
TreeHugger Robot
d901b27e28 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours am: 16ab663f53 -s ours am: f343c0e49a -s ours am: b60e477794 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I74f7a98541a2e4f1ab495cc6974529a59e192a65
2021-09-24 18:20:09 +00:00
Bill Yi
41a2051ca0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours am: f78bbdeedc -s ours am: cd039bb2de -s ours am: 99781d9e65 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4716f36bae34e2ec55dbb0cdf07cf6c0d8fc8784
2021-09-24 18:18:52 +00:00
Bill Yi
c889e4b444 Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-dev-plus-aosp am: 93e7956a7e am: 798e2adb59 am: 07ae1a8ba8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513

Change-Id: I6496cdd7ae77ea9b43c7798e2fa365040a5e60d9
2021-09-24 18:17:36 +00:00
Bill Yi
1fbcd17b8e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f am: 2175bf57c6 -s ours am: 27649a27e9 -s ours am: 7bfa6852da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I59adb4fb444c42129c32029438aaeb302e8f3509
2021-09-24 18:17:35 +00:00
Bill Yi
3f5ceb9602 Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-dev-plus-aosp am: 3d46803aee am: b8dff25882 am: 2ae1d2c280
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516

Change-Id: If11fb20eda2714ad8b58fb7833edffb9f48d11f4
2021-09-24 18:11:42 +00:00
Bill Yi
6c4cdf960c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163 am: fab8681446 -s ours am: 767ce7ca1b -s ours am: 4ecb61728b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e6329ca20cf7578d99286fed9b215eb4e3d61c4
2021-09-24 18:11:37 +00:00
TreeHugger Robot
24f84bbe2d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours am: 58a441f611 -s ours am: df6573b91e -s ours am: ac35cacba3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If8ee7bb6b90949a0ce7a0c72ef972c9435488363
2021-09-24 18:09:44 +00:00
Bill Yi
0a1f42887b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours am: 7f395f18b2 -s ours am: e2bf04f17b -s ours am: fa58f95b39 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0ec6dba96225d54a36c6d09b4d1393cd522039c3
2021-09-24 18:06:49 +00:00
TreeHugger Robot
b60e477794 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours am: 16ab663f53 -s ours am: f343c0e49a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I40aecbde5b554bee851f6b071e1e4ef030f20b0d
2021-09-24 17:43:35 +00:00
Bill Yi
99781d9e65 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours am: f78bbdeedc -s ours am: cd039bb2de -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f8999bfa8c83799963498921b5989d2b9c9996c
2021-09-24 17:43:15 +00:00
Bill Yi
07ae1a8ba8 Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-dev-plus-aosp am: 93e7956a7e am: 798e2adb59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513

Change-Id: I2b9f4dbbbd184b07a7f0f7b65b3b93d6dfc5fda0
2021-09-24 17:42:51 +00:00
Bill Yi
7bfa6852da [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f am: 2175bf57c6 -s ours am: 27649a27e9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If32b06ccf546af0c8d7a949e1f83d71d729eda1c
2021-09-24 17:42:51 +00:00
Bill Yi
2ae1d2c280 Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-dev-plus-aosp am: 3d46803aee am: b8dff25882
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516

Change-Id: I599d306dae2bcfe7491d6eebea1fcc549c27f4b2
2021-09-24 17:42:21 +00:00
Bill Yi
4ecb61728b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163 am: fab8681446 -s ours am: 767ce7ca1b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6689a3dea7282941fad720dc81bf3ace2c8370a5
2021-09-24 17:42:20 +00:00
TreeHugger Robot
ac35cacba3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours am: 58a441f611 -s ours am: df6573b91e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ecde33522c685e17a25a81f30ef1d2336473e50
2021-09-24 17:41:43 +00:00
Bill Yi
fa58f95b39 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours am: 7f395f18b2 -s ours am: e2bf04f17b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia56b84d5c9de7acef48ab0566d937a421d5b4804
2021-09-24 17:41:15 +00:00
TreeHugger Robot
f343c0e49a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours am: 16ab663f53 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic7d79aacc898a4b86c34df1f0e8e58edb1446e84
2021-09-24 17:27:37 +00:00
Bill Yi
ae4fff711e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d -s ours am: d1c7967860 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic036830f354dafa03569921a8aa55586a2f8f683
2021-09-24 17:26:36 +00:00
Bill Yi
cf6a28e4ed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22 -s ours am: e984af65ce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I20479a1ffbc8a7ff11da45f06fd0861912858c82
2021-09-24 17:26:31 +00:00
Bill Yi
399e5d70e1 Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-mainline-prod am: d5d07973eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513

Change-Id: Ia8e9b813ff03949c88eb68dd06e6a92a0eb23ee3
2021-09-24 17:26:28 +00:00
Bill Yi
fecd81164e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e5819c510b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia676ab10fdc2be1abcf9f0229a7eb6ae868373d4
2021-09-24 17:26:18 +00:00
Bill Yi
cd039bb2de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours am: f78bbdeedc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3a9d81bd7af985a14c1ac756775b6ffaf0a03a0b
2021-09-24 17:26:16 +00:00
Bill Yi
30fe925e8a Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-mainline-prod am: 7c5b96a608
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516

Change-Id: I726b4c63c6db7b7a9d66f809990f7266481e1aaa
2021-09-24 17:26:08 +00:00
TreeHugger Robot
1767df8516 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours am: 8b76cbe82c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ide1ab0f062dee24a3e0a99ad63c4a5cb4dc01e25
2021-09-24 17:25:53 +00:00
Bill Yi
831bd8b2b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours am: 395e5ecfe8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c161d23ce09b9b19c65389fb806adbbae2a515f
2021-09-24 17:25:41 +00:00
Bill Yi
d1c7967860 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5243ecbb2b03700df9add0c1f2b9c2eb687157da
2021-09-24 17:25:31 +00:00
Bill Yi
e984af65ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2ba298d6fb25a5aff884b70fede792fb61d320cd
2021-09-24 17:25:22 +00:00
Bill Yi
798e2adb59 Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-dev-plus-aosp am: 93e7956a7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513

Change-Id: Ib1965639952ad39d8c94229b0c02b94f996ea688
2021-09-24 17:15:20 +00:00
Bill Yi
27649a27e9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f am: 2175bf57c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id1d9ce2eaa7b8a59362e88c53c4ccf3b84e74eb8
2021-09-24 17:15:20 +00:00
Bill Yi
b8dff25882 Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-dev-plus-aosp am: 3d46803aee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516

Change-Id: I35df749b6c90df88c39b385a6fe6b973d30ce5ad
2021-09-24 17:15:11 +00:00
Bill Yi
767ce7ca1b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163 am: fab8681446 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I84c2a01d26139d8b82755e98b052b60751dc3153
2021-09-24 17:15:11 +00:00
TreeHugger Robot
df6573b91e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours am: 58a441f611 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I264dbd4f666e93d707ddc9b4486f55552a9a7a46
2021-09-24 17:14:45 +00:00
Bill Yi
e2bf04f17b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours am: 7f395f18b2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I119c980481b99e5ef5db212fdf324fcd29fffce0
2021-09-24 17:14:32 +00:00
Bill Yi
d5d07973eb Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
  Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:13:34 +00:00
Bill Yi
6fbb5d9668 Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f 2p: 1c066cdf39
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
  Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:13:34 +00:00
Bill Yi
d43653e80d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-24 17:13:34 +00:00
Bill Yi
93e7956a7e Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
  Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:13:34 +00:00
Bill Yi
e5819c510b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-09-24 17:11:02 +00:00
Bill Yi
e1595ad806 Merge changes from topic "presubmit-am-cd7500b708de4331afb38e45a28cb807"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a53b49ca21
  Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:11:02 +00:00
Bill Yi
7c5b96a608 Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
  Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:10:56 +00:00
Bill Yi
ffa2c65c22 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-24 17:10:56 +00:00
Bill Yi
3d46803aee Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
  Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:10:56 +00:00
Bill Yi
abbf254bf3 Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163 2p: 1f612599e9
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
  Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:10:56 +00:00
TreeHugger Robot
300affa6f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: de59a250f8 -s ours am: f78cb86b4b -s ours am: 6a3ff3a0f6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I50a02d32e71f86575d628497a139e4de8ed08fb3
2021-09-24 17:05:58 +00:00
TreeHugger Robot
2a929508f3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: f337947e27 -s ours am: bf23269e34 -s ours am: de9f58d841 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb06a9c43100619ccc01bcbfc4a2ec97cc5593a2
2021-09-24 17:05:49 +00:00
TreeHugger Robot
ac3e1b5918 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 504cc273ab -s ours am: 60fc50f537 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I92abeb6607c50cf875765bcb6f8fd4eb4b854092
2021-09-24 17:05:32 +00:00
TreeHugger Robot
4b1fe2a535 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 86c7df45c9 -s ours am: 0e520dd82c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d20bc83db64f331df4c15a9d47cbfdf4364e51b
2021-09-24 17:05:16 +00:00
TreeHugger Robot
16ab663f53 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic29e3bfc8ee0d8837ea923f3a80f333a7578f9af
2021-09-24 17:01:46 +00:00
Bill Yi
f78bbdeedc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7965d6f1a57b2e26c13d88d00c81d051f197ac1b
2021-09-24 17:01:35 +00:00
TreeHugger Robot
6a3ff3a0f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: de59a250f8 -s ours am: f78cb86b4b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iabb1e278da9198b0e80bc2d7a3822c83eb78445c
2021-09-24 17:01:03 +00:00