diff options
| author | Andy Stadler <stadler@google.com> | 2011-06-03 10:33:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-03 10:33:13 -0700 |
| commit | 7ac3f736f4acf3a0d1e495417afb5caa637fd1f7 (patch) | |
| tree | d34fe2e4f36c1f82e05f7ab391e959bce7b54a7b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e73d276f8bd271faa9d225ea3928a13af61f4f7a (diff) | |
| parent | d163899fa609c333513c7a51663dbb7609d85561 (diff) | |
am c22d145a: am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
* commit 'c22d145a9f26314e23ea678e96766755268e878b':
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