Merge "Hide VoicemailContract.setQuota()" into nyc-dev am: 4f2a1d0913

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

Fri, 20 May 2016 01:14:08 +0000 (01:14 +0000)

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

Fri, 20 May 2016 01:14:08 +0000 (01:14 +0000)
author Ta-wei Yen <twyen@google.com>
Fri, 20 May 2016 01:14:08 +0000 (01:14 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 20 May 2016 01:14:08 +0000 (01:14 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/java/android/provider/VoicemailContract.java
Simple merge
author	Ta-wei Yen <twyen@google.com>
	Fri, 20 May 2016 01:14:08 +0000 (01:14 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 20 May 2016 01:14:08 +0000 (01:14 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/provider/VoicemailContract.java	patch \|	diff1 \|	diff2 \|	blob \| history