Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense...

author Junda Liu <junda@google.com>

Wed, 13 May 2015 22:13:23 +0000 (22:13 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 13 May 2015 22:13:24 +0000 (22:13 +0000)
author Junda Liu <junda@google.com>
Wed, 13 May 2015 22:13:23 +0000 (22:13 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 13 May 2015 22:13:24 +0000 (22:13 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Junda Liu <junda@google.com>
	Wed, 13 May 2015 22:13:23 +0000 (22:13 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 13 May 2015 22:13:24 +0000 (22:13 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history