diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-05-27 12:35:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-27 12:35:18 -0700 |
| commit | 2c03020da7d2876beb7ce2191a9c3570fd07061b (patch) | |
| tree | 2e6c7cfa32c293f7fd4aa65eb772567fe6465e65 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9994e682f1d98677ca90987843198d5bcb3135c9 (diff) | |
| parent | f007f06d61cae6c0ab9e841bf69ad38a2cc20f66 (diff) | |
am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
Merge commit '9f95c64e66df7481b1c624c6cf29569ca384a822' into froyo-plus-aosp
* commit '9f95c64e66df7481b1c624c6cf29569ca384a822':
Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions