Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff

author Ji Yang <yangji@google.com>

Thu, 26 May 2016 16:12:55 +0000 (16:12 +0000)

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

Thu, 26 May 2016 16:12:55 +0000 (16:12 +0000)
author Ji Yang <yangji@google.com>
Thu, 26 May 2016 16:12:55 +0000 (16:12 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 26 May 2016 16:12:55 +0000 (16:12 +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	Ji Yang <yangji@google.com>
	Thu, 26 May 2016 16:12:55 +0000 (16:12 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 26 May 2016 16:12:55 +0000 (16:12 +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