Brad Ebinger 4b2604d3d1 resolve merge conflicts of 17c69f5414 to pi-dev-plus-aosp ...

Bug: 120986348
Bug: 120945804
Test: Treehugger
Merged-In: I4d7a203dd57050535867329c8dc36f8c75667c15
Change-Id: Ia2378265df93dd6b605b1b4af53e415c6ded1faf

2019-01-16 00:11:38 +00:00

..

provider

Public SIM_APN_URI uri and deprecated mcc, mnc, mvno_type, mvno_data

2018-12-20 15:16:23 +08:00

telephony

resolve merge conflicts of 17c69f5414 to pi-dev-plus-aosp

2019-01-16 00:11:38 +00:00