diff options
| author | Gilles Debunne <debunne@google.com> | 2010-08-27 10:34:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-27 10:34:47 -0700 |
| commit | 0f6ded9a6a3ddd91069dd02d6d271ebd426684ae (patch) | |
| tree | 1ab9fec699641f5be0d4ba9dd2c5d44fd21b0bd0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8c7738865cf1b6b9dc1a786aa2f76e259ae7d77b (diff) | |
| parent | 9c060fe8e0262a3cd3ce9d5dbd11dcffab6cd92c (diff) | |
am b8fd0473: Merge "Fix for 512 limit in assetManager.list" into gingerbread
Merge commit 'b8fd047311e329f2b8dbe3d228488ba844718ee1' into gingerbread-plus-aosp
* commit 'b8fd047311e329f2b8dbe3d228488ba844718ee1':
Fix for 512 limit in assetManager.list
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions