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
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
Amy Hsu
cf0ef7ae38
Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f
...
Change-Id: Ife2360ddac1e760471c0ab22f588f344e0d6723d
2020-05-20 08:51:01 +00:00
Amy Hsu
f18ab3712b
Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f
...
Change-Id: I71ba7d138d710e02a7b486940cced02c8dde9e57
2020-05-20 08:50:48 +00:00
Amy Hsu
a75dddbf9f
Merge "Move PeakRefreshRateController to Settings app" into rvc-dev
2020-05-20 08:48:56 +00:00
TreeHugger Robot
4af7cebe18
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours
...
am skip reason: subject contains skip directive
Change-Id: I54dc9b432f4b13258c3ff07c789ab4fcc57de45e
2020-05-20 08:43:38 +00:00
TreeHugger Robot
cb56953dca
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours
...
am skip reason: subject contains skip directive
Change-Id: I59a7f6597789f6bea36a28cc05e0fdd879cb1ab2
2020-05-20 08:43:28 +00:00
TreeHugger Robot
28621803f4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I765701491e6cebbe89a71942d79cb959fc40d659
2020-05-20 08:32:21 +00:00
TreeHugger Robot
ede8bf5f96
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I3cf7fe65b1ad1366aa48661e1fb15e71c6ee0764
2020-05-20 08:32:16 +00:00
TreeHugger Robot
a47d90f59c
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-05-20 08:30:46 +00:00
TreeHugger Robot
3041c88e65
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-05-20 08:20:55 +00:00
Bonian Chen
daf6c9e85b
[Settings] Remove mobile network v1
...
Cherry-pick of Ib365ba712af62729ca35abbc370aef087ce52a90
Fixes: 142920912
Test: rebuild, robolectric
Merged-In: Ib365ba712af62729ca35abbc370aef087ce52a90
Change-Id: I1554d475e0f34971381dcc42817573f98f958825
2020-05-20 07:49:33 +00:00
Automerger Merge Worker
b0bc07ff9e
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours am: a9bc27d354 -s ours" into rvc-d1-dev-plus-aosp am: a88d8f79a6 -s ours am: a0e10b84ee -s ours
...
am skip reason: subject contains skip directive
Change-Id: I20ea2a5d9e0106a4b602fc41cbd93e6c75857cc6
2020-05-20 07:47:41 +00:00
TreeHugger Robot
dba434acb6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours am: 3d5669a8b4 -s ours am: 1e4fc3c6fe -s ours am: 49090d1614 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I76536b4f7960eb162e0b0807cf626bb7ea999650
2020-05-20 07:47:34 +00:00
Automerger Merge Worker
695d54e4c6
Merge "Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: baad4770c0" into rvc-d1-dev-plus-aosp am: 7c5eed987f am: e3047f425c
...
Change-Id: I0e686fd8ffd393a4217d4b1ec8d53907e2468a93
2020-05-20 07:47:27 +00:00
TreeHugger Robot
405704471c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours am: a9bc27d354 -s ours am: 8b1d467def -s ours am: 93ca2601ef -s ours
...
am skip reason: subject contains skip directive
Change-Id: I370e98a3fe96accd26893f76e38f7275da636c36
2020-05-20 07:46:50 +00:00
Automerger Merge Worker
6bc2e745ea
Merge "Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: baad4770c0 am: 2e3c04571e" into rvc-qpr-dev-plus-aosp am: 71b52ffb2f
...
Change-Id: Ic9eb97954cf4052edb72d4f48213be06b464d591
2020-05-20 07:46:30 +00:00
TreeHugger Robot
6b29e7a567
Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: b5a3893f76 am: 2772005888 am: 4210565481
...
Change-Id: I785a1360fb3151a2249dcc0ace63e81f59a0048a
2020-05-20 07:45:32 +00:00
Automerger Merge Worker
a0e10b84ee
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours am: a9bc27d354 -s ours" into rvc-d1-dev-plus-aosp am: a88d8f79a6 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic7b033727834172133a126b40304df960b1f6a06
2020-05-20 07:27:06 +00:00
TreeHugger Robot
49090d1614
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours am: 3d5669a8b4 -s ours am: 1e4fc3c6fe -s ours
...
am skip reason: subject contains skip directive
Change-Id: I8d32a3c13c27cc1a47b0363c794a5f0ff9954248
2020-05-20 07:27:00 +00:00
Automerger Merge Worker
e3047f425c
Merge "Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: baad4770c0" into rvc-d1-dev-plus-aosp am: 7c5eed987f
...
Change-Id: I85aeb033ea77eb4f8d2ecf75c73972b0146c3e90
2020-05-20 07:26:41 +00:00
TreeHugger Robot
93ca2601ef
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours am: a9bc27d354 -s ours am: 8b1d467def -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ifada17ce3685d9b49532491b5bf462211a123450
2020-05-20 07:26:33 +00:00
