diff options
| author | Andy Stadler <stadler@google.com> | 2011-03-08 18:41:20 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-08 18:41:20 -0800 |
| commit | 9b710f2b11a6f7763615f3efc01926c075cddf9e (patch) | |
| tree | c517292ae18695afb3ef3ee85da20b040648b636 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d93f21323e82110fd40bd2ff5577da064f850f03 (diff) | |
| parent | 8d30d91cb44fe882a55ade32e6bfeeda2258f794 (diff) | |
am bdec2e56: am c9e59899: Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1
* commit 'bdec2e565bd1f086d65a956db432bf54cdf78f6d':
Clarify rules about encryption of emulated storage.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions