Commit Graph

72766 Commits

Author SHA1 Message Date
Jason Chiu
f9e51c8063 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 6417468179 am: 0e23f24b93 am: 0137611923
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: I6d25914f7760402bebc6fdac57e428e7b35a8fc9
2020-07-06 03:45:07 +00:00
Automerger Merge Worker
3585819dd4 Merge "Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 2af4f657bb am: be2838c636" into rvc-qpr-dev-plus-aosp am: 696d020daa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: I7662c659bd3411f4b11305d9aeeb47130a86ae06
2020-07-06 03:44:54 +00:00
Stanley Wang
80630990c5 Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 1e05cbb580 am: 1a3b276ac6 am: a224467ace
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: I108b124af840b48bec6f9f5497d7008bf59a01b9
2020-07-06 03:44:38 +00:00
Stanley Wang
bdb2d38636 Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 2af4f657bb am: 561efd1e11 am: e5c7bd0962
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: I37ebba90d13e0380fbb8771052407082c47b0b8e
2020-07-06 03:44:21 +00:00
Automerger Merge Worker
c6c70549af Merge "Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 6417468179 am: 7ac5f24a1d" into rvc-qpr-dev-plus-aosp 2020-07-06 03:32:19 +00:00
Jason Chiu
08ddd23d85 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 6417468179 am: 7ac5f24a1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: Ibafb75e3b219b6105b75975925b5616487af0bc0
2020-07-06 03:32:16 +00:00
Jason Chiu
8220b04f22 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 4334b51165 am: 3b04be0299
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: I6d338da1163db00893756ac48b0e5f9f938c8866
2020-07-06 03:32:14 +00:00
Jason Chiu
0137611923 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 6417468179 am: 0e23f24b93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: Ic335d3e840f7b1f8d97046b11fc15dc17914720a
2020-07-06 03:32:06 +00:00
Automerger Merge Worker
696d020daa Merge "Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 2af4f657bb am: be2838c636" into rvc-qpr-dev-plus-aosp 2020-07-06 03:32:03 +00:00
Stanley Wang
774ecba3ff Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 2af4f657bb am: be2838c636
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: I06df8f3b3b9f2ceed633a225de0e3a8ababbbbbe
2020-07-06 03:31:56 +00:00
Stanley Wang
a224467ace Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 1e05cbb580 am: 1a3b276ac6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: Ie7694e1b81769719b089e3e14977fe0e22d194b0
2020-07-06 03:31:54 +00:00
Stanley Wang
e5c7bd0962 Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 2af4f657bb am: 561efd1e11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: Ibc416ff03a63bcb75eecbea722a8c104ad05c3d0
2020-07-06 03:31:35 +00:00
Jason Chiu
7ac5f24a1d Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 6417468179
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: Iab3cf8d2f65d676c9b254a8b4f47abc3bd28cfe4
2020-07-06 03:19:19 +00:00
Jason Chiu
3b04be0299 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 4334b51165
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: I934151fb0bf62ff9a4748d5a804666180f3f6cf5
2020-07-06 03:19:12 +00:00
Jason Chiu
0e23f24b93 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 6417468179
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: I3a6e119e5ac02b1149e546f1669dba3ea68f1f3c
2020-07-06 03:19:03 +00:00
Stanley Wang
be2838c636 Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 2af4f657bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: Ie0b0ec0b4d11a2a8853504c47655173d07adc4e9
2020-07-06 03:19:03 +00:00
Stanley Wang
1a3b276ac6 Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 1e05cbb580
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: Icdd5ac59524471c051a76d6d9b6b468e0663451d
2020-07-06 03:18:50 +00:00
Stanley Wang
561efd1e11 Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 2af4f657bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: I13ea37f868fef7c56613925b863e721a967e41b5
2020-07-06 03:18:43 +00:00
Jason Chiu
4334b51165 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: Ib2169fa737b0c6344b77860896a6f4fa5b98ef41
2020-07-06 03:03:56 +00:00
Jason Chiu
6417468179 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: I591401d5f239885d25ba43b99e962341f90bda1c
2020-07-06 03:03:50 +00:00
Stanley Wang
1e05cbb580 Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: I1aecef654565cc8520a720a20cc5c3afb1a17378
2020-07-06 03:03:49 +00:00
Stanley Wang
2af4f657bb Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: Iac0ec59e405443bc1edcb142f6c0f6f194b8ca30
2020-07-06 03:03:37 +00:00
Jason Chiu
98eedf79d5 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev 2020-07-06 02:48:31 +00:00
Stanley Wang
6458ea872c Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev 2020-07-06 02:45:51 +00:00
TreeHugger Robot
835d61173d [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 5aca5b752c -s ours am: 1ae0eb1cf4 -s ours am: 8b64e18a67 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1060434e70cae0f5ca79f208c4b9b6dd22c8a653
2020-07-06 00:48:09 +00:00
Automerger Merge Worker
ba0737529c Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 609664b8c4 -s ours am: 8165edfbe4 -s ours" into rvc-qpr-dev-plus-aosp am: 524769810f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic55421812b439dedb3e5c27bdb74235976132c20
2020-07-06 00:47:44 +00:00
TreeHugger Robot
e14d69dad6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 609664b8c4 -s ours am: 6488a3dccd -s ours am: 629a63cd3a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3035b9e1fa0592de7927404f38c3c721bbc45530
2020-07-06 00:47:14 +00:00
TreeHugger Robot
8b64e18a67 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 5aca5b752c -s ours am: 1ae0eb1cf4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia1e0116d81784d18168cd229bb03355c50ba67f3
2020-07-06 00:37:40 +00:00
Automerger Merge Worker
524769810f Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 609664b8c4 -s ours am: 8165edfbe4 -s ours" into rvc-qpr-dev-plus-aosp 2020-07-06 00:37:19 +00:00
TreeHugger Robot
d015a60c0e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 609664b8c4 -s ours am: 8165edfbe4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0679e97d5c942a6815be682c718d1da62891af6b
2020-07-06 00:37:13 +00:00
TreeHugger Robot
629a63cd3a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 609664b8c4 -s ours am: 6488a3dccd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie737521e8ae5dca1620641518c58d75efc248139
2020-07-06 00:37:03 +00:00
TreeHugger Robot
1ae0eb1cf4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 5aca5b752c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I593a13e9af4a9057437b600849fd42ce2681c14c
2020-07-06 00:25:54 +00:00
TreeHugger Robot
6488a3dccd [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 609664b8c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I13455b4db6b77915d923c8d90ddcecbe9298d44a
2020-07-06 00:25:46 +00:00
TreeHugger Robot
8165edfbe4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 609664b8c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic57e1314c68bdcd48c597b17392fdadc20f68f81
2020-07-06 00:25:36 +00:00
TreeHugger Robot
609664b8c4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I04ee9c383b853e21da8e0fe93b2fabde40aab270
2020-07-06 00:16:45 +00:00
TreeHugger Robot
5aca5b752c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb18c6816cc05929ee7092ee686aa5e19785cc53
2020-07-06 00:16:40 +00:00
TreeHugger Robot
32cca3cb83 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ccbbb5c5c2de481e72808820b1035d35a0bf1f3
2020-07-06 00:04:51 +00:00
TreeHugger Robot
f2528db4de Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-07-05 23:43:58 +00:00
Bill Yi
2d8860a81f [automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours am: 94d87aa5f4 -s ours am: 538f3b464d -s ours am: 0675ab3e48 -s ours am: 2ad9e51ee0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3724c86cfe295fbf030509f102aa5c1f6a862241
2020-07-05 21:41:55 +00:00
Bill Yi
11a543217c [automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours am: 94d87aa5f4 -s ours am: 50d226b634 -s ours am: 1457e7205f -s ours am: 01016afd1e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4dc8e839e191e18109ff31a871f74910901ec52f
2020-07-05 21:40:54 +00:00
Bill Yi
c501b25e3b [automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours am: 94d87aa5f4 -s ours am: 538f3b464d -s ours am: c7652b63a2 -s ours am: 62b1049bab -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib586ad3610f310b8e439e2d1d2bf6563bf45176a
2020-07-05 21:40:00 +00:00
Bill Yi
2ad9e51ee0 [automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours am: 94d87aa5f4 -s ours am: 538f3b464d -s ours am: 0675ab3e48 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idcdba73afd733cc3275d451650464adb27272bd0
2020-07-05 21:27:55 +00:00
Bill Yi
01016afd1e [automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours am: 94d87aa5f4 -s ours am: 50d226b634 -s ours am: 1457e7205f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I22b80ddbaf36bc0cb33f091b0e18fbc057ad3c26
2020-07-05 21:21:54 +00:00
Bill Yi
62b1049bab [automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours am: 94d87aa5f4 -s ours am: 538f3b464d -s ours am: c7652b63a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie1ef0e332855dd6009bce5a5297033f9c1f7417b
2020-07-05 21:21:29 +00:00
Bill Yi
1457e7205f [automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours am: 94d87aa5f4 -s ours am: 50d226b634 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0cb1de1ed1868a680881a32ac779bfb2099e212a
2020-07-05 21:12:41 +00:00
Bill Yi
0675ab3e48 [automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours am: 94d87aa5f4 -s ours am: 538f3b464d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad65b669e5b51c61dbfa665858fe9d66aeac5587
2020-07-05 21:12:20 +00:00
Bill Yi
c7652b63a2 [automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours am: 94d87aa5f4 -s ours am: 538f3b464d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I17b4f97775eae5da1f81c044e2058d885ba2b5e0
2020-07-05 21:12:11 +00:00
Bill Yi
50d226b634 [automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours am: 94d87aa5f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I03a1fd779f295328c6b19ee9205af23126ad775d
2020-07-05 21:00:09 +00:00
Bill Yi
538f3b464d [automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours am: 94d87aa5f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifa250ce1df5528bfae99aed308832a91d17cc0bf
2020-07-05 20:59:38 +00:00
Bill Yi
94d87aa5f4 [automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e259f31598ec919754135ea245d023b443b9446
2020-07-05 20:50:14 +00:00