diff options
| author | Dan Morrill <morrildl@google.com> | 2011-06-13 15:41:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-13 15:41:56 -0700 |
| commit | 1575b4353d941520d5cc2b2cf7c27dcc0a9e0ede (patch) | |
| tree | bbdf2bc63defba2671ac9c60a981b4da18140ca9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 20173b499c85f64291f9f466082bf105c7f06991 (diff) | |
| parent | 308a3f179ed0957a9dbb52947ca7337501eb93f6 (diff) | |
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.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions