tree 800c38410addc4d1ff8ce291fe828ee610eccf48
parent 128dfa514818399ff8b5fde56fa487374f6fd504
parent 252c64f9c3e2e357f8687e18d8a066cc1cdb8c15
author John Wang <johnwang@google.com> 1329252160 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329252160 -0800

am 252c64f9: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1

* commit '252c64f9c3e2e357f8687e18d8a066cc1cdb8c15':
  Only use CDMA rssi for config_alwaysUseCdmaRssi.