Merge "Make TelephonyManager#get/setAllowedCarriers system api" am: 6d064d8780 am...

author Polina Bondarenko <pbond@google.com>

Mon, 23 Jan 2017 17:20:58 +0000 (17:20 +0000)

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

Mon, 23 Jan 2017 17:20:58 +0000 (17:20 +0000)
author Polina Bondarenko <pbond@google.com>
Mon, 23 Jan 2017 17:20:58 +0000 (17:20 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 17:20:58 +0000 (17:20 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/content/pm/PackageManager.java
Simple merge
author	Polina Bondarenko <pbond@google.com>
	Mon, 23 Jan 2017 17:20:58 +0000 (17:20 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 23 Jan 2017 17:20:58 +0000 (17:20 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/content/pm/PackageManager.java	patch \|	diff1 \|	diff2 \|	blob \| history