diff options
| author | Grace Kloba <klobag@google.com> | 2010-03-01 16:13:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-01 16:13:21 -0800 |
| commit | c0524d26a6bcfa28a930f446717dffcd9ce3c3f5 (patch) | |
| tree | 6b865934eeb1e867c716ab87186daeda11a842e9 /opengl/java/android/opengl/Texture.java | |
| parent | 3ca122df9e9a25f7ed1c39ef18c5c4ba2e316fe8 (diff) | |
| parent | 3ff7cecd3d9a1bb9485e32b0e6920f24022a5565 (diff) | |
am 3ff7cecd: Merge "DO NOT MERGE" into eclair-mr2
Merge commit '3ff7cecd3d9a1bb9485e32b0e6920f24022a5565' into eclair-mr2-plus-aosp
* commit '3ff7cecd3d9a1bb9485e32b0e6920f24022a5565':
DO NOT MERGE
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions