diff options
| author | Justin Ho <justinho@google.com> | 2011-03-14 18:25:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 18:25:43 -0700 |
| commit | beb4a201a59c20bc24cae5538609fbccace38f32 (patch) | |
| tree | cafc00670911caca00d26f0f2048a2ee8b5afa09 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 37e8286256e5fce9a26d1872a0636e0f4a72abaf (diff) | |
| parent | 83d83cb42afab8a9629138cc3199ad5aa7849bd2 (diff) | |
am cc886b93: Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1
* commit 'cc886b93681b75a9b89331930435e0f527b2c3d7':
Fixing naming for disabled paste assets Updated paste assets
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions