* commit 'b9d77b19e94a714275a4ee5ab1fe3b5ec65d9336': Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense.
* commit 'b9d77b19e94a714275a4ee5ab1fe3b5ec65d9336': Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense.