am f6d023ec: am bef17491: am 9eaff61a: am 91bb62f0: New API 4 with new CDMA constants.
am f6d023ec: am bef17491: am 9eaff61a: am 91bb62f0: New API 4 with new CDMA constants.

Merge commit 'f6d023ec93b461e874687f52deec1fc30cc8ea90'

* commit 'f6d023ec93b461e874687f52deec1fc30cc8ea90':
  New API 4 with new CDMA constants.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base