Commit Graph

94774 Commits

Author SHA1 Message Date
Bill Yi
b0f2b985f2 [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: I45e89df28a0955ea1b3b854c393c09c8083ad991
2021-09-03 20:23:32 +00:00
Bill Yi
338683dd86 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours am: 729b22ab1a -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: I9ed7d8c92154a6e67539cec9ce4eae3dcfa2a94e
2021-09-03 20:22:50 +00:00
TreeHugger Robot
20a3a9ac3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -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: I21533a0770fa30d42849b0ed39e6d21c3651a4a0
2021-09-03 20:22:37 +00:00
Bill Yi
b5590eddc6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours am: 9df033b383 -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: I88fc59da6b8457a4e93d25d7a41ab26b03af6364
2021-09-03 20:22:29 +00:00
TreeHugger Robot
8151478da6 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-09-03 20:11:45 +00:00
Bill Yi
b33a9e9bca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -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: Ida46ec1fe7ee8f08e606a823761b80da7f217d1a
2021-09-03 20:06:28 +00:00
Bill Yi
729b22ab1a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -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: Iee05cb245cac65f158837831a38a7ee8f8b4bf53
2021-09-03 20:05:26 +00:00
Bill Yi
9df033b383 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -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: Ic31a5b9d69690b2df25a695cfbc30d5a064d5baf
2021-09-03 20:04:35 +00:00
TreeHugger Robot
a08ae6df50 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-09-03 20:03:25 +00:00
Bill Yi
fcec6efb01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -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: I829fa5fbd3cc0525bcf3819e6c499d57c278110d
2021-09-03 19:55:43 +00:00
TreeHugger Robot
22787df2a2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: 9902d7a14b -s ours am: a58f50c62c -s ours am: 4d2402d66e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2ec2858780225419eb152904726add4fa43d865c
2021-09-03 18:32:36 +00:00
TreeHugger Robot
e7e62dfdaa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: 9902d7a14b -s ours am: 5050698472 -s ours am: 6904383a97 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib6ebb440cda04d2dd1481ce12e884085481431cf
2021-09-03 18:32:25 +00:00
Bill Yi
7e88c1e732 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: 65fa976c50 -s ours am: 3e508b953b -s ours am: e2aec9cc99 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iac845ea900ee29340c2d7692f35a9bc5dbf79060
2021-09-03 18:32:09 +00:00
Bill Yi
998fe4ce7a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: 65fa976c50 -s ours am: afeeb379fd -s ours am: 85080c0d13 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie2a6b630d48281cf77086060b1180d9d5c0b81cc
2021-09-03 18:31:53 +00:00
TreeHugger Robot
13b4cfd182 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: c1074b5f62 -s ours am: 84726902c0 -s ours am: 85f98b37ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0f0d9dd216b1feb1aab42928ff8ca602b5cc104
2021-09-03 18:31:12 +00:00
Bill Yi
20d6ddf090 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: a8d332257c -s ours am: 89891e1ccc -s ours am: 835b2ec21a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5aa5b408d3e37df6fb468ce56282a9449fb94cc2
2021-09-03 18:28:26 +00:00
TreeHugger Robot
4d2402d66e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: 9902d7a14b -s ours am: a58f50c62c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0052c3c8972ba2f53f74ecbd78d4ff775089cf0b
2021-09-03 18:19:09 +00:00
TreeHugger Robot
6904383a97 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: 9902d7a14b -s ours am: 5050698472 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5da6aa94fa3eca190ff5a35e942b8499dce8b5b
2021-09-03 18:14:34 +00:00
Bill Yi
e2aec9cc99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: 65fa976c50 -s ours am: 3e508b953b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1c3df4ec6631c66a5f15175fffd3f5a6ab0f4228
2021-09-03 18:14:12 +00:00
Bill Yi
85080c0d13 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: 65fa976c50 -s ours am: afeeb379fd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia3ec8797689ea8902209a0a77efd437f060f0cd6
2021-09-03 18:13:13 +00:00
TreeHugger Robot
85f98b37ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: c1074b5f62 -s ours am: 84726902c0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I32fb1d6b73966f4288327f71bbdc6b7fd0dece71
2021-09-03 18:10:15 +00:00
Bill Yi
835b2ec21a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: a8d332257c -s ours am: 89891e1ccc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I996f85857e627e964eef060eedb75e5ad49b4b8f
2021-09-03 18:07:36 +00:00
TreeHugger Robot
a58f50c62c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: 9902d7a14b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7d74ba2fdb89b6c74b8d752c7db124341c5eeb36
2021-09-03 17:53:46 +00:00
TreeHugger Robot
5050698472 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: 9902d7a14b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I57980dcaf54f815017641c6adb7a39a8be55838d
2021-09-03 17:53:42 +00:00
Bill Yi
3e508b953b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: 65fa976c50 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2cd97c62e9315366b425d9e50c6320cdb2a90267
2021-09-03 17:53:37 +00:00
Bill Yi
afeeb379fd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: 65fa976c50 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I04d961899a967788dbfd774262446062a8e5ffca
2021-09-03 17:53:21 +00:00
TreeHugger Robot
84726902c0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: c1074b5f62 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I309840aadf0670d2baddf1a6eaa9fd102531c9ba
2021-09-03 17:50:15 +00:00
Bill Yi
89891e1ccc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: a8d332257c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib851b0687140ff693c3e2594dbcbd2ad19c0ca0f
2021-09-03 17:50:01 +00:00
TreeHugger Robot
ad8ac653e9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: 54dd7bc722 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If3086c9e1ffbed7d144cd123ee0b201606378a10
2021-09-03 17:48:38 +00:00
Bill Yi
f3e1a03d2d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: 94cfa8d5bc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib539c55483b3d52f17031afc3370b41f2ef99aa2
2021-09-03 17:48:09 +00:00
TreeHugger Robot
9902d7a14b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idc3146a3ffaaeb3184b40b09cbb8faf3b17a4941
2021-09-03 17:35:57 +00:00
Bill Yi
65fa976c50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6698a049f45900b997140b3edba8e6276258a41c
2021-09-03 17:35:17 +00:00
TreeHugger Robot
54dd7bc722 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I39bd3ab2e0d04e53768b8f8b5ed3b7b4a7a743d1
2021-09-03 17:34:03 +00:00
TreeHugger Robot
c1074b5f62 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0dc5b576460cc5b337f77926ca9666ffedf4f96c
2021-09-03 17:34:02 +00:00
Bill Yi
a8d332257c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f5e43f26006eeac146ea0d3d4ffa00eca6aaa05
2021-09-03 17:33:40 +00:00
Bill Yi
94cfa8d5bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: If4cb70a6d62bef38bfd4a1bec498073e7a049b0b
2021-09-03 17:33:32 +00:00
TreeHugger Robot
7cc77723ae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a64f9f261b -s ours am: 4d237e36d4 -s ours am: 001f86dfd5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaa69f511b60a6c64c3720e1a042a6d543ca9125e
2021-09-03 17:26:51 +00:00
Ember Rose
2ec042c722 Merge "Revert "Support two pane design in the Settings app."" into sc-v2-dev am: 3377f1c04e am: aa472315b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751404

Change-Id: Ic5c1cad46a16d48cf27f88e353cd3afc4b886604
2021-09-03 17:26:32 +00:00
TreeHugger Robot
fe20e0edc1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 76af5ca27c -s ours am: 0ce2aee04b -s ours am: 382afb2c27 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5c503ecb6c01aae4e212fe357dd8d64a12972df6
2021-09-03 17:26:24 +00:00
TreeHugger Robot
0be41880b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a64f9f261b -s ours am: 16d1f56b9a -s ours am: 0f57a8f8ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie3436cb131fde04f59be38b55fac217c4927d8ef
2021-09-03 17:24:34 +00:00
TreeHugger Robot
0d17107cac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 76af5ca27c -s ours am: 31d4dc9360 -s ours am: f213b7f82f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0f1b943234b5ef783abb46477107453360a0f1c
2021-09-03 17:23:46 +00:00
TreeHugger Robot
5f68ddb6e0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 84c4d4e69e -s ours am: fae37889ab -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee475d5377d3adbef341eeb08209cb176248b776
2021-09-03 17:22:26 +00:00
TreeHugger Robot
001f86dfd5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a64f9f261b -s ours am: 4d237e36d4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8540408b02a7f4cd642cd2d9b869170200d337f3
2021-09-03 17:21:22 +00:00
TreeHugger Robot
f4ae9c2556 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: d9cd4e3358 -s ours am: 0157697765 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie9ddb340ad3d79cf8075d128e040fe104ddae819
2021-09-03 17:21:02 +00:00
Ember Rose
aa472315b9 Merge "Revert "Support two pane design in the Settings app."" into sc-v2-dev am: 3377f1c04e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751404

Change-Id: I449ef55d577a50dfe519275578b2b551bfacbe4e
2021-09-03 17:20:08 +00:00
TreeHugger Robot
382afb2c27 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 76af5ca27c -s ours am: 0ce2aee04b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie44f5a9e623ac1830de86368b0db9f5bfb043051
2021-09-03 17:19:26 +00:00
Ember Rose
3377f1c04e Merge "Revert "Support two pane design in the Settings app."" into sc-v2-dev 2021-09-03 17:17:38 +00:00
TreeHugger Robot
3a95d44f50 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4501ee71cd0c08085d6b3738707f1cfc7f351cf8
2021-09-03 17:17:35 +00:00
Bill Yi
de3754f4bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie2d61e3f19685d48ff4679f4b030bd94bb4b86b7
2021-09-03 17:15:14 +00:00
Tsung-Mao Fang
07037dbc3f Revert "Support two pane design in the Settings app."
This reverts commit a12a0d1eb2.

Reason for revert:  See a build error in git_sc-v2-dev-plus-aosp/aosp_crosshatch-userdebug

Bug: 198722766
Change-Id: Ibf812bf92595f57409e3c6d9cda6a1dfa4a8c72c
2021-09-03 17:12:47 +00:00