tim peng
df1b7e701c
Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e am: 642f7582f3 am: 25f75d6aff
...
Change-Id: I606e87e0a93d23e1e022f0a730e7c64f1155480a
2020-05-27 06:21:08 +00:00
tim peng
7a87480f82
Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e am: e20f765484 am: ceb23093e9
...
Change-Id: Ib58c3bee7da488d0237a6333234fc35de07ea44f
2020-05-27 06:20:19 +00:00
Yanting Yang
7806bd93ab
Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e am: 78062db3c0
...
Change-Id: Ib3caafb0d48d328a8001554d2e9f484e94fb611e
2020-05-27 06:03:47 +00:00
Yanting Yang
85b3154d07
Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e am: bf4f72b1fa
...
Change-Id: I12a4863f08261286a917107ada5caec420736814
2020-05-27 06:03:17 +00:00
Yanting Yang
0f540c174a
Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e am: 78062db3c0
...
Change-Id: Id69b98d104a0737322d2880ab01c2dbefded97e9
2020-05-27 06:03:10 +00:00
tim peng
25f75d6aff
Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e am: 642f7582f3
...
Change-Id: I50307c2887497dc7c4f8945b42a2f1bb5e254513
2020-05-27 06:03:02 +00:00
Automerger Merge Worker
f544256d76
Merge "Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e am: 642f7582f3" into rvc-d1-dev-plus-aosp
2020-05-27 06:02:47 +00:00
tim peng
ceb23093e9
Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e am: e20f765484
...
Change-Id: I5a6472a35315e5a2add2e8029560382b8227eec8
2020-05-27 06:02:40 +00:00
tim peng
c8ac688630
Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e am: 642f7582f3
...
Change-Id: I6aabf39f353225da4c6a73ac21ef4340e3cd2095
2020-05-27 06:02:32 +00:00
Yanting Yang
bf4f72b1fa
Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e
...
Change-Id: I6eb31ab162338e52a754dc098752feefa6d8dcd0
2020-05-27 05:48:03 +00:00
Yanting Yang
78062db3c0
Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e
...
Change-Id: I8e01770d89641ec469611bf15be4b68de0f22a3a
2020-05-27 05:47:48 +00:00
tim peng
642f7582f3
Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e
...
Change-Id: I1db8e8958622895cc818b115ae84758266bfab80
2020-05-27 05:47:10 +00:00
tim peng
e20f765484
Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e
...
Change-Id: Ie65855100b43c1f0829856d103f4dd5bde426d84
2020-05-27 05:46:56 +00:00
TreeHugger Robot
ba152dd2a7
Merge "Update Bluetooth AVRCP default version to 1.5" into rvc-d1-dev am: bcc9f31b2b am: de8892ebae
...
Change-Id: I30ed6851c0f9564b7392549411bce9fe0067333a
2020-05-27 05:38:14 +00:00
Automerger Merge Worker
acdbe09ac2
Merge "Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: b8301bceed" into rvc-d1-dev-plus-aosp am: c391a7fc70
...
Change-Id: I37ddd56a765cfd9d2448ed96893094b413543384
2020-05-27 05:37:58 +00:00
TreeHugger Robot
495bf0a826
Merge "Update Bluetooth AVRCP default version to 1.5" into rvc-d1-dev am: bcc9f31b2b am: 32a2354bd5
...
Change-Id: I60c47ba3510fab941437f569f15f1fc5c6d3f0c7
2020-05-27 05:37:42 +00:00
Automerger Merge Worker
cedaad7fcc
Merge "Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: 4da1f84e33 am: 5cbb7a1eb7" into rvc-qpr-dev-plus-aosp
2020-05-27 05:37:39 +00:00
Yanting Yang
4e14ffd77e
Merge "Improve scrolling performance for App Info page" into rvc-dev
2020-05-27 05:37:36 +00:00
Paul Chang
ada3762118
Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: 4da1f84e33 am: 5cbb7a1eb7
...
Change-Id: If217693ff6e0e0e72c3e899b5bfe86f1034fd106
2020-05-27 05:37:35 +00:00
Paul Chang
47272f8cab
Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: 4da1f84e33 am: 988b6fb813
...
Change-Id: Ifefb16748f19b2b4fb74d14b8fd24f8b432c156e
2020-05-27 05:37:32 +00:00
tim peng
49217faf8e
Merge "Non-deselectable routes can be deselected" into rvc-dev
2020-05-27 05:32:34 +00:00
TreeHugger Robot
de8892ebae
Merge "Update Bluetooth AVRCP default version to 1.5" into rvc-d1-dev am: bcc9f31b2b
...
Change-Id: Ifc733843c6d4c3bfe5ff8f1b553ef154c7108d1c
2020-05-27 05:25:39 +00:00
TreeHugger Robot
32a2354bd5
Merge "Update Bluetooth AVRCP default version to 1.5" into rvc-d1-dev am: bcc9f31b2b
...
Change-Id: I5d4c8ab070a79059bd8a9426c62e4af65d3cd53b
2020-05-27 05:25:32 +00:00
TreeHugger Robot
bcc9f31b2b
Merge "Update Bluetooth AVRCP default version to 1.5" into rvc-d1-dev
2020-05-27 05:18:46 +00:00
Automerger Merge Worker
c391a7fc70
Merge "Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: b8301bceed" into rvc-d1-dev-plus-aosp
2020-05-27 05:16:30 +00:00
Paul Chang
7142a6d2c0
Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: b8301bceed
...
Change-Id: I9a167f07ca5a878a2ece5f3c42dc8ab5f4ef7bb6
2020-05-27 05:16:26 +00:00
Paul Chang
988b6fb813
Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: 4da1f84e33
...
Change-Id: Id0fc26c1bec4dd87b3ea5b5eda8a207465074461
2020-05-27 05:16:21 +00:00
Paul Chang
5cbb7a1eb7
Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: 4da1f84e33
...
Change-Id: I6eba1bc2cc500179579ab19b800b107d6be59845
2020-05-27 05:16:20 +00:00
Paul Chang
b8301bceed
Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf
...
Change-Id: I66e57a0211b810dcd83017a30b87999f69927251
2020-05-27 04:59:11 +00:00
Paul Chang
4da1f84e33
Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf
...
Change-Id: I8708a3ea80d1d030347a932c3d676ecf88c1d8bb
2020-05-27 04:58:51 +00:00
Paul Chang
f1fb7fb7cf
Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev
2020-05-27 04:46:21 +00:00
Automerger Merge Worker
70067d5c8c
Merge "Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48 am: 3ba8caae95" into rvc-qpr-dev-plus-aosp
2020-05-27 04:29:14 +00:00
TreeHugger Robot
57dde34962
Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48 am: 3ba8caae95
...
Change-Id: I19c1ee5f41777a829749e30dd587a12d4d63897a
2020-05-27 04:29:10 +00:00
TreeHugger Robot
498c52c1ca
Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: eb1f444fb1 am: 0c009aab13
...
Change-Id: I13cd271f9769063b66547d2d77e16092eecc75f0
2020-05-27 04:29:09 +00:00
TreeHugger Robot
74ffadfc24
Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48 am: 99b295c285
...
Change-Id: I98d5554058226c1ae8ebc715ac1acd17efa35ab9
2020-05-27 04:29:02 +00:00
TreeHugger Robot
0c009aab13
Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: eb1f444fb1
...
Change-Id: I2f2c654d85306d405769bc1626202a03d6fb1f39
2020-05-27 04:17:28 +00:00
TreeHugger Robot
3ba8caae95
Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48
...
Change-Id: I26d740dfda098abe5be5cf90fc27d4f0a22dd704
2020-05-27 04:17:14 +00:00
TreeHugger Robot
99b295c285
Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48
...
Change-Id: Ibbf5efba18de6266f64a822dc022ede299c5ac60
2020-05-27 04:17:14 +00:00
TreeHugger Robot
6c0e4e9e48
Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386
...
Change-Id: Idc6fe44f5c60e9bc82b6209a832b3d574e72a47a
2020-05-27 04:00:47 +00:00
TreeHugger Robot
eb1f444fb1
Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386
...
Change-Id: I98da412048dc0dbe100826809173763c70d7a15e
2020-05-27 04:00:38 +00:00
TreeHugger Robot
6d93851386
Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev
2020-05-27 03:46:25 +00:00
Treehugger Robot
74c0a8c209
[automerger skipped] Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce am: 6ea2228e31 -s ours am: 5d03f7d60f -s ours am: 6cefd1c525 -s ours
...
am skip reason: Change-Id Iecf3e385a88d18c7578eb520449f4042324e21f5 with SHA-1 e6fae38169
2020-05-27 02:20:48 +00:00
Treehugger Robot
6cefd1c525
[automerger skipped] Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce am: 6ea2228e31 -s ours am: 5d03f7d60f -s ours
...
am skip reason: Change-Id Iecf3e385a88d18c7578eb520449f4042324e21f5 with SHA-1 e6fae38169
2020-05-27 02:12:18 +00:00
Treehugger Robot
5d03f7d60f
[automerger skipped] Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce am: 6ea2228e31 -s ours
...
am skip reason: Change-Id Iecf3e385a88d18c7578eb520449f4042324e21f5 with SHA-1 e6fae38169
2020-05-27 02:03:37 +00:00
Treehugger Robot
6ea2228e31
Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce
...
Change-Id: I5ff6cfcf79cfeec14571ae4f34ea74fd658025d3
2020-05-27 01:52:00 +00:00
Treehugger Robot
d01838d8ce
Merge "Fix NPE if CarrierConfigManager is not available"
2020-05-27 01:36:46 +00:00
Brad Ebinger
525a07ec7f
Fix NPE if CarrierConfigManager is not available
...
Fixes: 155147094
Fixes: 155819375
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Change-Id: Iecf3e385a88d18c7578eb520449f4042324e21f5
Merged-In: Iecf3e385a88d18c7578eb520449f4042324e21f5
2020-05-26 15:50:41 -07:00
TreeHugger Robot
15a5d85ba0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 209c1ebbaf -s ours am: daf783ef1b -s ours
...
am skip reason: subject contains skip directive
Change-Id: Idbcb3559dd133d765e13b888b3614c7be93873bb
2020-05-26 18:43:48 +00:00
TreeHugger Robot
416025d9cb
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 209c1ebbaf -s ours am: 1aeb24b04c -s ours
...
am skip reason: subject contains skip directive
Change-Id: I1bf6b3afaadc3a7f44b069020ac14c9fe3945838
2020-05-26 18:38:51 +00:00
TreeHugger Robot
bbacebb475
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: c6efa831c1 -s ours am: 4791614cc8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I03e0f9a4f6072d69177f74014e8be46f1e08f527
2020-05-26 18:38:35 +00:00
