diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-24 18:05:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-24 18:05:14 -0700 |
| commit | afb309d573fa881dee4e97eb5e472e76fd8d69f3 (patch) | |
| tree | d6e18ebd5d4c79c152c8c46ff97d0fddfa5ad6f2 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 616300192830b92aecacda6c7d43bddc084b836f (diff) | |
| parent | 84b804678e54cdf8c84aa9f05c395457479662fe (diff) | |
am 234e42df: DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*
Merge commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a' into gingerbread-plus-aosp
* commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a':
DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions