diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-07-22 17:10:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-22 17:10:32 -0700 |
| commit | bbcd5930c56cf087854cd54750d1de06de15d319 (patch) | |
| tree | 88ded83d9598727cd20fbce1c26b638fbfbb5f91 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 164b7a466f1f169cad13103ba40db25f7b5cf021 (diff) | |
| parent | f31250adb3fc8439e8776637cd376794739e3e52 (diff) | |
am 3e930dba: (-s ours) am d1b4c10f: Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE
* commit '3e930dba58442776b3c921b3dc1980fdba2caed9':
DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions