OSDN Git Service

resolve merge conflicts of 187fe9d5cf3c to oc-dr1-dev-plus-aosp
authorfionaxu <fionaxu@google.com>
Thu, 22 Jun 2017 19:11:02 +0000 (12:11 -0700)
committerfionaxu <fionaxu@google.com>
Thu, 22 Jun 2017 19:20:52 +0000 (12:20 -0700)
commit35276a6696fb25adb613411b0f5b5d4b6869ab05
tree3cd3f4e0449212bfb4d9a3e3e19e4a1f90b4d0ac
parent4ba0f3ef07f5220644ee8ecf22df8650c716bd25
parent187fe9d5cf3caab5a6f25e6802dee637f00187a9
resolve merge conflicts of 187fe9d5cf3c to oc-dr1-dev-plus-aosp

Change-Id: I2cbfdd9b0fcf024509dbda84678ef067add014f9
core/res/res/values-mcc302-mnc370/config.xml
core/res/res/values-mcc302-mnc610/config.xml
core/res/res/values-mcc302-mnc640/config.xml
core/res/res/values-mcc302-mnc720/config.xml
core/res/res/values/config.xml
core/res/res/values/symbols.xml
telephony/java/android/telephony/CarrierConfigManager.java