diff options
| author | Andy Stadler <stadler@google.com> | 2011-03-08 14:53:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-08 14:53:06 -0800 |
| commit | 8d30d91cb44fe882a55ade32e6bfeeda2258f794 (patch) | |
| tree | ffa8444c8ca09fd26bed60ad7273697d26037c23 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c4aa42847a9f2dad743a6955006672246cd125dd (diff) | |
| parent | 37a29c70571da5a04087772bc861c19f2a2e2322 (diff) | |
am c9e59899: Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1
* commit 'c9e598995db68cf97dc3ed0fc527a35e2d966afd':
Clarify rules about encryption of emulated storage.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions