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
TreeHugger Robot
0f57a8f8ca
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a64f9f261b
-s ours am: 16d1f56b9a
-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: I56253c76b9cfbdce2270a8fee028acaac7d9ad3e
2021-09-03 17:03:16 +00:00
TreeHugger Robot
f213b7f82f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 76af5ca27c
-s ours am: 31d4dc9360
-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: I1e265bd64a26e52c4dd4dd5e440c8724ae8e3371
2021-09-03 17:02:55 +00:00
TreeHugger Robot
4d237e36d4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a64f9f261b
-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: I7afb74d01977622f0e510a73ef300d255a18d273
2021-09-03 17:02:49 +00:00
TreeHugger Robot
16d1f56b9a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a64f9f261b
-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: I9f23acfb28b8b87f61791d5ae1fcd2d68d655b3e
2021-09-03 17:02:42 +00:00
TreeHugger Robot
fae37889ab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 84c4d4e69e
-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: I3d5eb3336ecfdc592d5f9138e9a5261b99615cde
2021-09-03 17:02:41 +00:00
TreeHugger Robot
31d4dc9360
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 76af5ca27c
-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: Ie34c1b6d04b96e63047c190aa3b6132f23ec7303
2021-09-03 17:02:15 +00:00
TreeHugger Robot
0ce2aee04b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 76af5ca27c
-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: Ifbb867e713d9ea9b71b8ee8e2412b63575cc5ba3
2021-09-03 17:02:12 +00:00
TreeHugger Robot
0157697765
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: d9cd4e3358
-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: I34b6f24208fdc9f779957b3797f4f500c0168ed1
2021-09-03 17:01:57 +00:00
TreeHugger Robot
f1780afb1e
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-09-03 16:50:43 +00:00
TreeHugger Robot
84c4d4e69e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-09-03 16:47:39 +00:00
TreeHugger Robot
d9cd4e3358
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-09-03 16:47:33 +00:00
TreeHugger Robot
a64f9f261b
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-03 16:47:06 +00:00
TreeHugger Robot
76af5ca27c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-03 16:46:41 +00:00
TreeHugger Robot
2ae8237fee
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-09-03 16:39:16 +00:00
YUKAI HUNG
856fae9042
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-qpr1-dev am: 32e61bbeb7
-s ours am: e3f61dcf22
-s ours am: 3eaff9320b
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15715977
Change-Id: I5ac1844dca95bb8840aa25d202137116e3e5f6ba
2021-09-03 08:23:46 +00:00
YUKAI HUNG
9df034caee
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-qpr1-dev am: 32e61bbeb7
-s ours am: bfb214953e
-s ours am: 7a618acca6
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15715977
Change-Id: Icbe04a36aa976f0b8271c6af7d35310c8b25266a
2021-09-03 08:23:36 +00:00
YUKAI HUNG
3eaff9320b
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-qpr1-dev am: 32e61bbeb7
-s ours am: e3f61dcf22
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15715977
Change-Id: I849ba40997a4726261da07aaa552e45682d75dd5
2021-09-03 08:10:16 +00:00
YUKAI HUNG
7a618acca6
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-qpr1-dev am: 32e61bbeb7
-s ours am: bfb214953e
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15715977
Change-Id: Id8de2dd27294e69bfe0ff6350030d94c15fa2599
2021-09-03 08:09:44 +00:00
YUKAI HUNG
bfb214953e
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-qpr1-dev am: 32e61bbeb7
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15715977
Change-Id: If14c84483416d18deb8b71db1750eeb89168a221
2021-09-03 07:52:46 +00:00
YUKAI HUNG
e3f61dcf22
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-qpr1-dev am: 32e61bbeb7
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15715977
Change-Id: I91cbfd0137a787f2202fcb20c2b2f2cce2adb50a
2021-09-03 07:52:45 +00:00
YUKAI HUNG
32e61bbeb7
Merge "Hide Camera background running time in the battery usage screen" into sc-qpr1-dev
2021-09-03 07:33:29 +00:00
changbetty
8dec2efc67
Change the SIM color for passing the GAR
...
Bug: 195710292
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I7b7a3e1b6d72709acbae0a0433af897a28d73afc
Merged-In: I7b7a3e1b6d72709acbae0a0433af897a28d73afc
2021-09-03 04:07:31 +00:00
YUKAI HUNG
6251f443da
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
am: 0a11568b82
-s ours am: 1f1455a083
-s ours am: 819c36798c
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 2401ec4235
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822
Change-Id: I51947677794a267e9a4d906b3889e0beb2ef9e86
2021-09-03 03:38:31 +00:00
YUKAI HUNG
2a78d336db
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
am: 0a11568b82
-s ours am: 8d49d45f1e
-s ours am: bd77f257cf
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822
Change-Id: Ifa23a6fa587ac9d8ff1c4e062f32fda13495c778
2021-09-03 03:38:24 +00:00
YUKAI HUNG
264ec4f47d
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
am: fab65bcfe5
am: 0051f1e3e9
-s ours am: d1006b47b8
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 2401ec4235
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822
Change-Id: I2d2308268fd993110c4cef686e9bb4edbe67e466
2021-09-03 03:38:16 +00:00