Merge "Type Allocation Code & Manufacturer Code"

author Jordan Liu <jminjie@google.com>

Fri, 6 Jul 2018 19:06:39 +0000 (12:06 -0700)

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

Fri, 6 Jul 2018 19:06:39 +0000 (12:06 -0700)
author Jordan Liu <jminjie@google.com>
Fri, 6 Jul 2018 19:06:39 +0000 (12:06 -0700)
committer android-build-merger <android-build-merger@google.com>
Fri, 6 Jul 2018 19:06:39 +0000 (12:06 -0700)
diff --cc api/current.txt
Simple merge
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
diff --cc telephony/java/com/android/internal/telephony/ITelephony.aidl
Simple merge
author	Jordan Liu <jminjie@google.com>
	Fri, 6 Jul 2018 19:06:39 +0000 (12:06 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 6 Jul 2018 19:06:39 +0000 (12:06 -0700)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/TelephonyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/com/android/internal/telephony/ITelephony.aidl	patch \|	diff1 \|	diff2 \|	blob \| history