am 69dd4bba: Merge "Add keys to handle GSM and CDMA roaming/non roaming overrides...

author Chris Manton <cmanton@google.com>

Wed, 17 Jun 2015 21:33:06 +0000 (21:33 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Wed, 17 Jun 2015 21:33:06 +0000 (21:33 +0000)
author Chris Manton <cmanton@google.com>
Wed, 17 Jun 2015 21:33:06 +0000 (21:33 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 17 Jun 2015 21:33:06 +0000 (21:33 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
author	Chris Manton <cmanton@google.com>
	Wed, 17 Jun 2015 21:33:06 +0000 (21:33 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 17 Jun 2015 21:33:06 +0000 (21:33 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/CarrierConfigManager.java	patch \|	diff1 \|	diff2 \|	blob \| history