Merge "Make voicemail notification broadcast public"

author Ta-wei Yen <twyen@google.com>

Tue, 22 Nov 2016 01:32:00 +0000 (01:32 +0000)

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

Tue, 22 Nov 2016 01:32:00 +0000 (01:32 +0000)
author Ta-wei Yen <twyen@google.com>
Tue, 22 Nov 2016 01:32:00 +0000 (01:32 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 22 Nov 2016 01:32:00 +0000 (01:32 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
author	Ta-wei Yen <twyen@google.com>
	Tue, 22 Nov 2016 01:32:00 +0000 (01:32 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 22 Nov 2016 01:32:00 +0000 (01:32 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/TelephonyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history