diff options
| author | Andy Stadler <stadler@google.com> | 2011-06-03 10:28:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-03 10:28:45 -0700 |
| commit | d163899fa609c333513c7a51663dbb7609d85561 (patch) | |
| tree | d2f239199978ac899b2cb0c16098ca86f8e23cbf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ffc24f1b5baf4da8e5e184534d9bc8f8961f1bc0 (diff) | |
| parent | 4d68ae93e26b30fe9fb15dbb249f01166c30e4ca (diff) | |
am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
* commit '3148557c42aaa8abf4001dc6fd759e911ba55280':
DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions