TreeHugger Robot
02a76bea3b
Merge "Update Bluetooth AVRCP default version to 1.5" into rvc-d1-dev am: bcc9f31b2b am: 32a2354bd5 am: 495bf0a826 am: 1341f19feb
...
Change-Id: I76da503af1d2543e30790106966c0ef3e959b2d1
2020-05-27 06:03:12 +00:00
Automerger Merge Worker
ffb2b3cadb
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 am: cedaad7fcc am: 9528969dd2
...
Change-Id: I59581ccdbd8dccfb0469edf042dea8ef7956f166
2020-05-27 06:02:54 +00:00
Paul Chang
8b8810c12b
Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: 4da1f84e33 am: 988b6fb813 am: 47272f8cab am: a668edecb6
...
Change-Id: I6ac3f2beb267b4471f2e0780925b9a34a318fa68
2020-05-27 06:02:36 +00:00
TreeHugger Robot
1341f19feb
Merge "Update Bluetooth AVRCP default version to 1.5" into rvc-d1-dev am: bcc9f31b2b am: 32a2354bd5 am: 495bf0a826
...
Change-Id: I2cdf13c428ffab6e79cb019a36329443edaa2896
2020-05-27 05:47:38 +00:00
Automerger Merge Worker
9528969dd2
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 am: cedaad7fcc
...
Change-Id: I9acaec0914abea8a765209df20b2dc3e4228753f
2020-05-27 05:47:22 +00:00
Paul Chang
a668edecb6
Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: 4da1f84e33 am: 988b6fb813 am: 47272f8cab
...
Change-Id: I387514103eb1c8da9e971dd39123aacd1b93278a
2020-05-27 05:47:13 +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
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
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
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
Automerger Merge Worker
3705d09af8
[automerger skipped] Merge "Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48 am: 3ba8caae95" into rvc-qpr-dev-plus-aosp am: 70067d5c8c -s ours am: bb61ca6777 -s ours
...
am skip reason: Change-Id I48ac11364b06887cc4059bcda863b456e206c9bd with SHA-1 2547d0617c
2020-05-27 05:10:28 +00:00
TreeHugger Robot
fab3f65d4f
[automerger skipped] Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: eb1f444fb1 am: 0c009aab13 am: 498c52c1ca -s ours am: 405768ace6 -s ours
...
am skip reason: Change-Id I48ac11364b06887cc4059bcda863b456e206c9bd with SHA-1 2547d0617c
2020-05-27 05:10:21 +00:00
TreeHugger Robot
d213a7e9ac
[automerger skipped] Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48 am: 99b295c285 am: 74ffadfc24 -s ours am: bea39a4949 -s ours
...
am skip reason: Change-Id I48ac11364b06887cc4059bcda863b456e206c9bd with SHA-1 2547d0617c
2020-05-27 05:10:14 +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
Automerger Merge Worker
bb61ca6777
[automerger skipped] Merge "Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48 am: 3ba8caae95" into rvc-qpr-dev-plus-aosp am: 70067d5c8c -s ours
...
am skip reason: Change-Id I48ac11364b06887cc4059bcda863b456e206c9bd with SHA-1 2547d0617c
2020-05-27 04:48:46 +00:00
TreeHugger Robot
405768ace6
[automerger skipped] Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: eb1f444fb1 am: 0c009aab13 am: 498c52c1ca -s ours
...
am skip reason: Change-Id I48ac11364b06887cc4059bcda863b456e206c9bd with SHA-1 2547d0617c
2020-05-27 04:48:37 +00:00
TreeHugger Robot
bea39a4949
[automerger skipped] Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48 am: 99b295c285 am: 74ffadfc24 -s ours
...
am skip reason: Change-Id I48ac11364b06887cc4059bcda863b456e206c9bd with SHA-1 2547d0617c
2020-05-27 04:48:28 +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
384d9b16c8
[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: 74c0a8c209 -s ours am: 21d1e74444 -s ours
...
am skip reason: Change-Id Iecf3e385a88d18c7578eb520449f4042324e21f5 with SHA-1 e6fae38169
2020-05-27 02:46:46 +00:00
Treehugger Robot
21d1e74444
[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: 74c0a8c209 -s ours
...
am skip reason: Change-Id Iecf3e385a88d18c7578eb520449f4042324e21f5 with SHA-1 e6fae38169
2020-05-27 02:32:28 +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
73f3d442d1
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 209c1ebbaf -s ours am: daf783ef1b -s ours am: 15a5d85ba0 -s ours am: b0400007ab -s ours
...
am skip reason: subject contains skip directive
Change-Id: I7449087ffe3d1457882108cb14306243fab1600b
2020-05-26 19:35:25 +00:00
TreeHugger Robot
632536a04a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 209c1ebbaf -s ours am: 1aeb24b04c -s ours am: 416025d9cb -s ours am: e3ae01da82 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I25e24437a0a1f6e4b603cd5711f65e93f0e3ecd7
2020-05-26 19:35:20 +00:00
TreeHugger Robot
88dc8ec2f4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: c6efa831c1 -s ours am: 4791614cc8 -s ours am: bbacebb475 -s ours am: c717fefe7d -s ours
...
am skip reason: subject contains skip directive
Change-Id: I4a0a4e7577c8f23bd0de2686dc8b30996a755df8
2020-05-26 19:35:14 +00:00
TreeHugger Robot
766f7692ba
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: c6efa831c1 -s ours am: d852aa4cc1 -s ours am: dc90982241 -s ours am: 908b794632 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I86c30e20645dd6afe8f61fa81a9b6625f2120dce
2020-05-26 19:34:41 +00:00
TreeHugger Robot
b0400007ab
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 209c1ebbaf -s ours am: daf783ef1b -s ours am: 15a5d85ba0 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I1c3e6b69fb7f2fa80d35f75892b5104a825d3b4f
2020-05-26 19:20:09 +00:00
TreeHugger Robot
e3ae01da82
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 209c1ebbaf -s ours am: 1aeb24b04c -s ours am: 416025d9cb -s ours
...
am skip reason: subject contains skip directive
Change-Id: I0dfb64b4aed5997beec2c23d7175e0d41cf1fa0f
2020-05-26 19:20:02 +00:00
TreeHugger Robot
c717fefe7d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: c6efa831c1 -s ours am: 4791614cc8 -s ours am: bbacebb475 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie5daf08e3c038d28950e38187f4ed16bd2fa0fbb
2020-05-26 19:19:21 +00:00
TreeHugger Robot
908b794632
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: c6efa831c1 -s ours am: d852aa4cc1 -s ours am: dc90982241 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I6babc838acd067b406e6ea07c1017f9577848ac9
2020-05-26 19:17:24 +00: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
