Merge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8 am: 02cc8151a6

author Jonathan Basseri <misterikkit@google.com>

Wed, 2 Aug 2017 01:51:21 +0000 (01:51 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 2 Aug 2017 01:51:21 +0000 (01:51 +0000)
author Jonathan Basseri <misterikkit@google.com>
Wed, 2 Aug 2017 01:51:21 +0000 (01:51 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 01:51:21 +0000 (01:51 +0000)
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
diff --cc telephony/java/com/android/internal/telephony/ITelephony.aidl
Simple merge
author	Jonathan Basseri <misterikkit@google.com>
	Wed, 2 Aug 2017 01:51:21 +0000 (01:51 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 2 Aug 2017 01:51:21 +0000 (01:51 +0000)
		1	2
telephony/java/android/telephony/TelephonyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/com/android/internal/telephony/ITelephony.aidl	patch \|	diff1 \|	diff2 \|	blob \| history