am 4d0f2afd: Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the...
am 4d0f2afd: Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense." into mnc-dev
* commit '4d0f2afd':
Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense.