diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-18 13:35:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-18 13:35:33 -0700 |
| commit | b2858d0163fd66fb0ce4010fafe9d2c849629698 (patch) | |
| tree | de30c854a07ca8eb3eb435e8437fb70e2c3d5dc3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 719664a059e22f06a81bee6cc0c7dc2c6e57d9ae (diff) | |
| parent | 1ccb98835ab811253be0304b669eff9aba6db93e (diff) | |
am 3719f856: (-s ours) DO NOT MERGE resolved conflicts for merge of 8c11e952 to gingerbread-plus-aosp
Merge commit '3719f8568e809ffd30f90adc38993256a9d3d066'
* commit '3719f8568e809ffd30f90adc38993256a9d3d066':
DO NOT MERGE WifiLock extensions for high performance mode
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions