Commit Graph

69671 Commits

Author SHA1 Message Date
TreeHugger Robot
5898ac0e40 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours am: ac648d6916 -s ours am: 5446562899 -s ours
am skip reason: subject contains skip directive

Change-Id: I4c45fea8c66a52be4069cec7d34eeb7a84fb33fc
2020-05-20 16:49:19 +00:00
TreeHugger Robot
5446562899 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours am: ac648d6916 -s ours
am skip reason: subject contains skip directive

Change-Id: I313496899c2833bb4238d6c2c024c0bce89b067b
2020-05-20 16:34:22 +00:00
TreeHugger Robot
ac648d6916 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours
am skip reason: subject contains skip directive

Change-Id: I1a6119bcc82c95a996d762eb9a28e6a2878f1ca1
2020-05-20 16:22:06 +00:00
TreeHugger Robot
42a6154347 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-20 16:00:46 +00:00
TreeHugger Robot
9ac0f1b9bf Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc am: ba98f11c56 am: f6d7ce24b0
Change-Id: I643251947f1966c323786a8af5417e3c0119d80f
2020-05-20 15:23:53 +00:00
Automerger Merge Worker
026fe497b5 Merge "Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674" into rvc-d1-dev-plus-aosp am: a06ef7b194 am: f2e45400fc
Change-Id: Id1fce889d0e4143f73c5dedee6d5f01789839ce5
2020-05-20 15:23:45 +00:00
TreeHugger Robot
9a3278579b Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc am: 742dd6f60c am: cf1486003e
Change-Id: I9cdc2f4a9eb2a8bb04b023f0bd7e789327640d98
2020-05-20 15:22:40 +00:00
TreeHugger Robot
f6d7ce24b0 Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc am: ba98f11c56
Change-Id: I05a82bbf4ef6f294ee887d2497dd62dad6ab8811
2020-05-20 15:03:04 +00:00
Automerger Merge Worker
f2e45400fc Merge "Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674" into rvc-d1-dev-plus-aosp am: a06ef7b194
Change-Id: I15801851140bacc91006a5f2f9791eebc2534e2c
2020-05-20 15:02:58 +00:00
TreeHugger Robot
cf1486003e Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc am: 742dd6f60c
Change-Id: Ia5e40b1a8df8f8d59881e0ec5d11e71178db6004
2020-05-20 15:02:49 +00:00
Automerger Merge Worker
a06ef7b194 Merge "Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674" into rvc-d1-dev-plus-aosp 2020-05-20 14:42:44 +00:00
TreeHugger Robot
1518db1927 Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674
Change-Id: Ica90e78597092bc44aabd28c5357fbe17ecffafe
2020-05-20 14:42:40 +00:00
TreeHugger Robot
ba98f11c56 Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc
Change-Id: Ia5cccbd846203fb0acbc6207d37091d1a3e908b3
2020-05-20 14:42:33 +00:00
TreeHugger Robot
742dd6f60c Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc
Change-Id: I764291b14b76fa7dd24644fe3ae739f324f4f5e9
2020-05-20 14:42:31 +00:00
TreeHugger Robot
d06d373674 Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda
Change-Id: I1867ea8309ed5ec9e8bda40f68cd6e56c69b1755
2020-05-20 14:32:11 +00:00
TreeHugger Robot
3ba40628fc Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda
Change-Id: Ibc06bd838df06258f98e87fcb3a9da43c47be504
2020-05-20 14:31:50 +00:00
TreeHugger Robot
946e3adeda Merge "Show subtext for previously connected devices on BT card" into rvc-dev 2020-05-20 14:10:31 +00:00
Bonian Chen
460a330411 [automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours am: 3d46b0e5ec -s ours am: e7495a57dc -s ours am: 47b98dd082 -s ours
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70 is in history

Change-Id: Ia88e5bfb526738861cb72f12fb194d2ce116bfcf
2020-05-20 13:54:38 +00:00
Bonian Chen
47b98dd082 [automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours am: 3d46b0e5ec -s ours am: e7495a57dc -s ours
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70 is in history

Change-Id: I2a9c3eaea606c66cba71fd5e23230aa924ec2dd7
2020-05-20 13:32:24 +00:00
Bonian Chen
e7495a57dc [automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours am: 3d46b0e5ec -s ours
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70 is in history

Change-Id: I0694e2236c4f7ecfb38583f3bb736f416991e434
2020-05-20 13:19:34 +00:00
Bonian Chen
3d46b0e5ec [automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70 is in history

Change-Id: Ide8eb53eff3252d31505cc975ea094d76c70bf31
2020-05-20 13:03:03 +00:00
Bonian Chen
075a17c995 Merge "[Settings] Remove mobile network v1" am: 10799d12fd
Change-Id: Id17878bd85d8e86f1cb42bc52a78fc5469278376
2020-05-20 12:45:32 +00:00
Bonian Chen
10799d12fd Merge "[Settings] Remove mobile network v1" 2020-05-20 12:28:20 +00:00
TreeHugger Robot
1f339625a5 Merge "Import translations. DO NOT MERGE" 2020-05-20 12:05:37 +00:00
TreeHugger Robot
b396f85c2c Merge "Import translations. DO NOT MERGE" 2020-05-20 10:32:25 +00:00
Automerger Merge Worker
b50d365fdf Merge "Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: cf0ef7ae38" into rvc-d1-dev-plus-aosp am: 64616b4168 am: b4150802d9
Change-Id: Iddf26e47a3dd41b340b8d9f5c124fff951fec245
2020-05-20 09:20:24 +00:00
Automerger Merge Worker
88c1ee765f Merge "Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b" into rvc-d1-dev-plus-aosp am: e828ebf069 am: fffb0764c9
Change-Id: Icfb9ed384608100db29ddccf0beb872b69fdfbe5
2020-05-20 09:19:58 +00:00
Amy Hsu
048eb1b00a Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b am: e67e058f26 am: 5e8ba70140
Change-Id: If073b3d860cbc53ac62548e7e211c512dfe42d0a
2020-05-20 09:18:48 +00:00
TreeHugger Robot
eb655e4098 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: cb56953dca -s ours am: 5c655b06a2 -s ours am: 7d40624fe1 -s ours
am skip reason: subject contains skip directive

Change-Id: I72f864db3e50e97e494ee6f2e26f632e5efaede8
2020-05-20 09:18:29 +00:00
TreeHugger Robot
6992256d5f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: 4af7cebe18 -s ours am: 8233c0573f -s ours am: bd9020b7fb -s ours
am skip reason: subject contains skip directive

Change-Id: I31a963d7baf6ea510edabb729d3db8919d5013f0
2020-05-20 09:18:23 +00:00
TreeHugger Robot
ab2a707d18 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65 -s ours am: ede8bf5f96 -s ours am: 8eeabd86cf -s ours
am skip reason: subject contains skip directive

Change-Id: Ia54d1b92e11a9a3a928ccbcff58cd0e9301e6db5
2020-05-20 09:18:16 +00:00
TreeHugger Robot
6cf3a2697a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: cb56953dca -s ours am: ef8dff39c9 -s ours am: 7420219600 -s ours
am skip reason: subject contains skip directive

Change-Id: I6d514f9c7e3472bee5631c0141ccadfe8b3e007d
2020-05-20 09:18:09 +00:00
TreeHugger Robot
f1d62a13cb [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65 -s ours am: 28621803f4 -s ours am: 78ca90d7f4 -s ours
am skip reason: subject contains skip directive

Change-Id: I4670b3b497492a6a0ee0249080358404ec732abe
2020-05-20 09:17:45 +00:00
Jason Chiu
07767907d5 Show subtext for previously connected devices on BT card
Fixes: 157089483
Test: visual, robotest
Change-Id: If4f2dec9df802a80a686827de7e61115e85d54a7
2020-05-20 17:02:43 +08:00
Automerger Merge Worker
b4150802d9 Merge "Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: cf0ef7ae38" into rvc-d1-dev-plus-aosp am: 64616b4168
Change-Id: Id19e0b9ce7d4ba376de92ff64a53812fc8b8beae
2020-05-20 08:59:32 +00:00
Automerger Merge Worker
fffb0764c9 Merge "Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b" into rvc-d1-dev-plus-aosp am: e828ebf069
Change-Id: Ib90a1528a9af18c3430479e6dd926f07e606afa4
2020-05-20 08:58:44 +00:00
Amy Hsu
5e8ba70140 Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b am: e67e058f26
Change-Id: I7fc511dba6f739653494c68753e191c8091f33b9
2020-05-20 08:58:34 +00:00
TreeHugger Robot
7d40624fe1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: cb56953dca -s ours am: 5c655b06a2 -s ours
am skip reason: subject contains skip directive

Change-Id: I3023f21efe715894fa139bcf44976c38386eb459
2020-05-20 08:58:20 +00:00
Automerger Merge Worker
64616b4168 Merge "Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: cf0ef7ae38" into rvc-d1-dev-plus-aosp 2020-05-20 08:58:17 +00:00
TreeHugger Robot
bd9020b7fb [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: 4af7cebe18 -s ours am: 8233c0573f -s ours
am skip reason: subject contains skip directive

Change-Id: I420b4a3412d41c8005f1484cecc3fc60569145d4
2020-05-20 08:58:10 +00:00
Automerger Merge Worker
e828ebf069 Merge "Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b" into rvc-d1-dev-plus-aosp 2020-05-20 08:58:08 +00:00
Amy Hsu
d1670efe92 Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: cf0ef7ae38
Change-Id: Id8eef41275fc48fe5e84531fd87277189b265f81
2020-05-20 08:58:08 +00:00
TreeHugger Robot
8eeabd86cf [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65 -s ours am: ede8bf5f96 -s ours
am skip reason: subject contains skip directive

Change-Id: If9af7ffd99b45dc98c3e8588a420ad0b44ae1510
2020-05-20 08:58:02 +00:00
Amy Hsu
ce64e46603 Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b
Change-Id: I8487aa59cacee8a261849dd50d2baafc0cbd5020
2020-05-20 08:57:59 +00:00
TreeHugger Robot
7420219600 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: cb56953dca -s ours am: ef8dff39c9 -s ours
am skip reason: subject contains skip directive

Change-Id: I2539a96dea3d1af2474d5ad1a2381548239af4f6
2020-05-20 08:57:57 +00:00
TreeHugger Robot
8233c0573f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: 4af7cebe18 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia78ce324f66fa421d4eed56ea201ae731d56f618
2020-05-20 08:57:57 +00:00
Amy Hsu
e67e058f26 Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b
Change-Id: I19d32b304c6988ece475d30ce9c9165120d84a6c
2020-05-20 08:57:55 +00:00
TreeHugger Robot
ef8dff39c9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: cb56953dca -s ours
am skip reason: subject contains skip directive

Change-Id: Iacb71f66379d50a479671559c830a56a67dce531
2020-05-20 08:57:47 +00:00
TreeHugger Robot
78ca90d7f4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65 -s ours am: 28621803f4 -s ours
am skip reason: subject contains skip directive

Change-Id: Iaebc96dc935e2bbdbf006e0a53bb0322e36672ca
2020-05-20 08:57:41 +00:00
TreeHugger Robot
5c655b06a2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: cb56953dca -s ours
am skip reason: subject contains skip directive

Change-Id: I5ffcea95d88a2ba67edd6cc420bec607e2765eb0
2020-05-20 08:57:37 +00:00