Commit Graph

94394 Commits

Author SHA1 Message Date
Bill Yi
7ad7aa12c0 Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev am: 0d2b7238bc am: cd985a6cda am: 5925687faa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667

Change-Id: I3b4fe19dff6f59429c97c72b803ab2b3be955037
2021-08-29 21:17:26 +00:00
Bill Yi
acc80c816f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 am: 1a1eba9262 -s ours am: 04d8c15606 -s ours am: c41d771696 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic9efe16e770e2390fb4faea3bb5103172ea33b3d
2021-08-29 21:17:24 +00:00
Bill Yi
284f34bd68 Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev am: b7f7a895fd am: c0170add88 am: 672aef8317
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678

Change-Id: I20d67af7b2cc098f849d29b689772fdda3ba2de6
2021-08-29 21:09:08 +00:00
Bill Yi
ae851209b3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 am: 30f4367fed -s ours am: dca06614d7 -s ours am: a6229746ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic379b8f9d5420a3f00d1ea743c01f581315baf1e
2021-08-29 21:09:07 +00:00
Bill Yi
bbbcbf1127 Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev am: 0d2b7238bc am: 7b3a20b43d am: d375f28fd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667

Change-Id: Ib7a3ee5a47242015ae5ab2c1ffaa41ff97309df8
2021-08-29 21:06:03 +00:00
Bill Yi
04ab2969f9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 am: 1a1eba9262 -s ours am: 74f497939e -s ours am: ef9b084efb -s ours
am skip reason: subject contains skip directive

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

Change-Id: If9dbd12540d446e8cc4ecbd4e7a713735ed45e25
2021-08-29 21:06:02 +00:00
Bill Yi
c24001e149 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours am: 1f17c42c16 -s ours am: 8239b2a6a8 -s ours am: de99d262e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I505415de497543c400736efb019f2f0c5bc12b6c
2021-08-29 21:01:46 +00:00
Bill Yi
a824bbf757 Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-dev-plus-aosp am: 3c86e4eb2d am: 9cc95ebe5b am: 77bff5ef7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667

Change-Id: I34507995e155c4791fc71634138343fbc5552461
2021-08-29 21:00:17 +00:00
Bill Yi
ab839b8f71 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 am: df34345697 -s ours am: da1bc4bff5 -s ours am: 64e5c9de09 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I09f05d42abafdef8f65e5e9cc779d8fbba7e18ae
2021-08-29 21:00:15 +00:00
Bill Yi
04db613462 Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev am: b7f7a895fd am: 91021b56dc am: bcbe3382ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678

Change-Id: Ibc9636e4734614f6fbbcef351e517b595d3e4be0
2021-08-29 20:58:22 +00:00
Bill Yi
18adf89ef3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 am: 30f4367fed -s ours am: d026c13fc6 -s ours am: c379e0ec81 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia7e3378820404b5efef34ee080edb60e22c23d7f
2021-08-29 20:58:21 +00:00
Bill Yi
8a064629f9 Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-dev-plus-aosp am: 110c972e70 am: edc641b1bf am: 92c1605bf8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678

Change-Id: I1094cb930e4eff3640ba7ea2a0169624324c5773
2021-08-29 20:56:32 +00:00
Bill Yi
f751633dac [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 am: a60710d90a -s ours am: 9a2e9009d3 -s ours am: 3301afbdf1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I40a80bd4b535cb6faf0dbd7f32eeafee1a410082
2021-08-29 20:56:22 +00:00
Bill Yi
5925687faa Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev am: 0d2b7238bc am: cd985a6cda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667

Change-Id: I9c24042908cab8d571b1b2504d3ef07057649363
2021-08-29 20:49:56 +00:00
Bill Yi
c41d771696 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 am: 1a1eba9262 -s ours am: 04d8c15606 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iabb84f9921bbe64eafe23ea6ff2bb2ece3b085b1
2021-08-29 20:49:55 +00:00
Bill Yi
672aef8317 Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev am: b7f7a895fd am: c0170add88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678

Change-Id: I7c24660c490a0dadf9c4d82abec0976cfe59e75a
2021-08-29 20:47:53 +00:00
Bill Yi
a6229746ea [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 am: 30f4367fed -s ours am: dca06614d7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib42badd4b757935d9eb247a4aabe6bd4f0b5f016
2021-08-29 20:47:51 +00:00
Bill Yi
d375f28fd9 Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev am: 0d2b7238bc am: 7b3a20b43d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667

Change-Id: Iaa2181598a2bfcc8a97fe5630f7ae050c13d6f51
2021-08-29 20:46:27 +00:00
Bill Yi
ef9b084efb [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 am: 1a1eba9262 -s ours am: 74f497939e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib200f404e6694cc471161af167a422e91f11eda1
2021-08-29 20:46:27 +00:00
Bill Yi
de99d262e0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours am: 1f17c42c16 -s ours am: 8239b2a6a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I231341792d38993cd025197ba7fc2f73486d02ae
2021-08-29 20:45:43 +00:00
Bill Yi
77bff5ef7f Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-dev-plus-aosp am: 3c86e4eb2d am: 9cc95ebe5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667

Change-Id: If52ec4968d8841768e0d433b219bc010da9fb286
2021-08-29 20:45:06 +00:00
Bill Yi
64e5c9de09 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 am: df34345697 -s ours am: da1bc4bff5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idc082ac4539ff2e9598223db17e58793879c1757
2021-08-29 20:45:06 +00:00
Bill Yi
bcbe3382ff Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev am: b7f7a895fd am: 91021b56dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678

Change-Id: I54d1f073416ca12441b25504c8917ed560f823f9
2021-08-29 20:43:27 +00:00
Bill Yi
c379e0ec81 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 am: 30f4367fed -s ours am: d026c13fc6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8e99e9781f340aa3c54284de6abe194caf61caa5
2021-08-29 20:43:26 +00:00
Bill Yi
7cce72c05a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948 -s ours am: b53d0089cb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I06e722c284e793ca7ae1ac519460b2d108d7d8e7
2021-08-29 20:42:26 +00:00
Bill Yi
92c1605bf8 Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-dev-plus-aosp am: 110c972e70 am: edc641b1bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678

Change-Id: Ic44a5c196626f22a982c019e4eae1165e82097b9
2021-08-29 20:42:18 +00:00
Bill Yi
f147f74b0a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours am: cc19de6420 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia6939c06c4d901ebb702ddab1bf51ed8b7713632
2021-08-29 20:42:17 +00:00
Bill Yi
3301afbdf1 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 am: a60710d90a -s ours am: 9a2e9009d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I753967f0ac2065569408cc7378982fb6c9337f21
2021-08-29 20:42:16 +00:00
Bill Yi
7b3a20b43d Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev am: 0d2b7238bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667

Change-Id: I2587536f2eb8e7050555110ec969d8c9e5324f25
2021-08-29 20:32:28 +00:00
Bill Yi
74f497939e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 am: 1a1eba9262 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I97c7379d45c961c40dc4fc479d926ce073016be4
2021-08-29 20:32:27 +00:00
Bill Yi
cd985a6cda Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev am: 0d2b7238bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667

Change-Id: I32caa59dc27a804810223e068b18de4c4a418f3c
2021-08-29 20:31:34 +00:00
Bill Yi
04d8c15606 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 am: 1a1eba9262 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2bf6b6155f6aef09a7a42a54d8e18d3b8fb915f9
2021-08-29 20:31:34 +00:00
Bill Yi
8239b2a6a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours am: 1f17c42c16 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id749548b969c6a12adc9dac11445681c779e76fb
2021-08-29 20:31:05 +00:00
Bill Yi
9cc95ebe5b Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-dev-plus-aosp am: 3c86e4eb2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667

Change-Id: Ic5b3c88919a60f39260376003c5d7592f3ea9d18
2021-08-29 20:29:52 +00:00
Bill Yi
da1bc4bff5 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 am: df34345697 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib093788d253564ade3cd80e33a704e1158b81e8a
2021-08-29 20:29:51 +00:00
Bill Yi
c0170add88 Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev am: b7f7a895fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678

Change-Id: I667cc3cebf4eb0ebb38cfcb54aff136df5248f19
2021-08-29 20:29:50 +00:00
Bill Yi
dca06614d7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 am: 30f4367fed -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2d1361ecdfb4910e108ecdada74a33323ed2f99b
2021-08-29 20:29:49 +00:00
Bill Yi
91021b56dc Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev am: b7f7a895fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678

Change-Id: Ie6e743cc3615104d55204925cf728dacb405cea4
2021-08-29 20:28:34 +00:00
Bill Yi
d026c13fc6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 am: 30f4367fed -s ours
am skip reason: subject contains skip directive

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

Change-Id: I588fea79f9a9b81a879a275459f075c76df712b4
2021-08-29 20:28:28 +00:00
Bill Yi
b53d0089cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9da0107bd11e76ba1e158b1fa48b5b04a007a042
2021-08-29 20:28:13 +00:00
Bill Yi
edc641b1bf Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-dev-plus-aosp am: 110c972e70
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678

Change-Id: Id20bf59d39993777389eea39b6d53be6f540cf8c
2021-08-29 20:27:37 +00:00
Bill Yi
9a2e9009d3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 am: a60710d90a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02fa5d5853913144419d79e9cfc7fab2947ca5ff
2021-08-29 20:27:36 +00:00
Bill Yi
1f17c42c16 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I676bc81dd2f0026702ac5cf128653338e9683502
2021-08-29 20:27:25 +00:00
Bill Yi
cc19de6420 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie7b0ce43ba4601703df172dcb9113e364678484b
2021-08-29 20:27:03 +00:00
Bill Yi
7d32928609 Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-mainline-prod am: fa54b86b5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667

Change-Id: Id2fa793f3eabd8806acedbb5e35fe9719b17a79d
2021-08-29 20:20:52 +00:00
Bill Yi
f447ed5d64 Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-mainline-prod am: 301c3365ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678

Change-Id: I6db5278c32906ce25f83697b1f2bab85bd4abcb8
2021-08-29 20:20:42 +00:00
Bill Yi
cd6055bb3c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 85a9e657e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b38971c5d426118153b769987c96f56adabba96
2021-08-29 20:20:31 +00:00
Bill Yi
5e733c2078 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2d6a17b989 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8639a0ed084cda53561959cb9b9a89d130712623
2021-08-29 20:20:21 +00:00
Bill Yi
0d2b7238bc Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440
  Import translations. DO NOT MERGE ANYWHERE
2021-08-29 20:09:43 +00:00
Bill Yi
3c86e4eb2d Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440
  Import translations. DO NOT MERGE ANYWHERE
2021-08-29 20:09:43 +00:00