diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-08-25 10:55:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 10:55:47 -0700 |
| commit | e58ed82d44f113974f28bc774407e881682adf61 (patch) | |
| tree | 0314b93c0f69ae613944b5e5ca4df9908f1217ad /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3734308dd59c48ac533713bd0ef3a9699c008825 (diff) | |
| parent | d61798d7ae88815af22630835ffbaffc9e56aac2 (diff) | |
am 24bf70ca: Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbread
Merge commit '24bf70cac0340c7556b4f98b690f3f9a3f80fc4a' into gingerbread-plus-aosp
* commit '24bf70cac0340c7556b4f98b690f3f9a3f80fc4a':
Update AndroidRuntime with dalvik-dev changes
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions