diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-08-20 13:54:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-20 13:54:28 -0700 |
| commit | c5b8ae8dce8c78142ae416af40a31e78e11f176c (patch) | |
| tree | 85f48fd8e5576feecb15939f81e6af4bbe1942fc /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8911b2add866e73331a4ce753918711120f423d8 (diff) | |
| parent | eedeeb877f479b714c880ebd7f98f54358abc119 (diff) | |
am 4d42ccd1: Tracking merge of dalvik-dev to gingerbread
Merge commit '4d42ccd1579da53aaaf132a6ad26a06e2baa5b98' into gingerbread-plus-aosp
* commit '4d42ccd1579da53aaaf132a6ad26a06e2baa5b98':
Tracking merge of dalvik-dev to gingerbread
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions