Chen Xu 47208e2cf5 Merge "initial value for data_roaming based on carrier" into oc-dr1-dev ...

am: 068397a319

Change-Id: I5c65666208e834a5b0ad5280f1670a0d7b31aa31

2017-07-19 03:12:33 +00:00

..

android/telephony

Merge "initial value for data_roaming based on carrier" into oc-dr1-dev

2017-07-19 03:12:33 +00:00

com/android

Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev

2017-07-07 23:12:44 +00:00