diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-04 09:27:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-04 09:27:35 -0700 |
| commit | e4b9834fea18fdd0885d8d062a8fd629e135bdf8 (patch) | |
| tree | fc098f415d69480b4046fda1d4e75b05633fe174 /opengl/java/android/opengl/Texture.java | |
| parent | dcb5f18fd6fac5d8048a11c60348bae82fbe739e (diff) | |
| parent | 6de3a6fdd303b15ad944570daf37faa798dc1989 (diff) | |
am 6de3a6fd: merge from open-source master
Merge commit '6de3a6fdd303b15ad944570daf37faa798dc1989' into kraken
* commit '6de3a6fdd303b15ad944570daf37faa798dc1989':
Fix typo of <p> end tag in appwidgets.xml
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions