tree 39f4f835ca29bac3a098156e9e907c88c5bf6cb1
parent 0b6cca4d6fd6f78fbdf8dcf0c880ccdcdbedcef4
parent 74e646cab9a28aa3716a05fc474853c2c557f942
author Dan Morrill <morrildl@google.com> 1308004916 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308004916 -0700

am 74e646ca: (-s ours) Fix merge conflict for \'c2e1e329\'.

* commit '74e646cab9a28aa3716a05fc474853c2c557f942':
  Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it.