diff options
| author | Patrick Dubroy <dubroy@google.com> | 2010-09-24 17:00:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-24 17:00:19 -0700 |
| commit | 616300192830b92aecacda6c7d43bddc084b836f (patch) | |
| tree | d6e18ebd5d4c79c152c8c46ff97d0fddfa5ad6f2 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ba4e66c14dede6becd6b163908e2c2fcf56edee9 (diff) | |
| parent | 84b804678e54cdf8c84aa9f05c395457479662fe (diff) | |
am 88aa072a: Merge "do not merge - Asset update (pass #3)" into gingerbread
Merge commit '88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f' into gingerbread-plus-aosp
* commit '88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f':
do not merge - Asset update (pass #3)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions