Merge \"Add more configuration state for visual voicemail\" into nyc-mr1-dev

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

Thu, 23 Jun 2016 02:35:38 +0000 (02:35 +0000)

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

Thu, 23 Jun 2016 02:35:38 +0000 (02:35 +0000)
author Ta-wei Yen <twyen@google.com>
Thu, 23 Jun 2016 02:35:38 +0000 (02:35 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 23 Jun 2016 02:35:38 +0000 (02:35 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Ta-wei Yen <twyen@google.com>
	Thu, 23 Jun 2016 02:35:38 +0000 (02:35 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 23 Jun 2016 02:35:38 +0000 (02:35 +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