diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-02-23 18:02:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-23 18:02:45 -0800 |
| commit | 48f8e8741950f2b4e069dbbd25452182effb275a (patch) | |
| tree | 2de34eaf949bd30904e7e7343a64fce86fec4561 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 05f5f4e91b4c00f6066f3f8cd2f6c0b828186aef (diff) | |
| parent | fe35362c3ae3d787648f1a2c0307c59d84d019da (diff) | |
am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb
* commit '5107eea64e46b0fffbbbcefa469a88044f309de6':
DO NOT MERGE Add support for background scanning
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions