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

Browse Source

* 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.

...

This commit is contained in:

Dan Morrill 2011-06-13 15:41:56 -07:00 committed by Android Git Automerger

parent 20173b499c 308a3f179e

commit 1575b4353d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available