diff options
| author | Doug Zongker <dougz@android.com> | 2009-10-13 13:47:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-13 13:47:54 -0700 |
| commit | b80d1d0cc8b75b9e51c94169892f1d03cdcd788a (patch) | |
| tree | 51a4c2ae6626cbe3630dd24bc5fdec5ed9f6654a /opengl/java/android/opengl/Texture.java | |
| parent | 947c45b29586b64c358b7824881d98faa8733ba8 (diff) | |
| parent | afbf8afa858a78b66c19f11cfda030e913b34085 (diff) | |
am afbf8afa: Merge change I564b5b00 into eclair-mr2
Merge commit 'afbf8afa858a78b66c19f11cfda030e913b34085' into eclair-mr2-plus-aosp
* commit 'afbf8afa858a78b66c19f11cfda030e913b34085':
add "junk path" -k option to aapt
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions