diff options
| author | Daniel Sandler <dsandler@android.com> | 2010-04-20 13:01:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-20 13:01:58 -0700 |
| commit | cf19b1ace0845714b8828a670cc1b645019e1883 (patch) | |
| tree | e12493e7eef9950f16847e02d1f4e680da84d5b7 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 86e5a3b0168a6b61abbb1d5f66805e8c40646c85 (diff) | |
| parent | 3438793a56c69274d5e9960706b95c0ac268efa7 (diff) | |
am c96307ef: Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo
Merge commit 'c96307efd2829cdd0fa7c835484f2f89edf7d883' into froyo-plus-aosp
* commit 'c96307efd2829cdd0fa7c835484f2f89edf7d883':
Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions