Merge "Cellinfo: Update to version 12" into mm-wireless-dev

author Sanket Padawe <sanketpadawe@google.com>

Mon, 25 Jan 2016 23:58:15 +0000 (23:58 +0000)

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

Mon, 25 Jan 2016 23:58:15 +0000 (23:58 +0000)
author Sanket Padawe <sanketpadawe@google.com>
Mon, 25 Jan 2016 23:58:15 +0000 (23:58 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 25 Jan 2016 23:58:15 +0000 (23:58 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Sanket Padawe <sanketpadawe@google.com>
	Mon, 25 Jan 2016 23:58:15 +0000 (23:58 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 25 Jan 2016 23:58:15 +0000 (23:58 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history