diff options
| author | Patrick Scott <phanna@android.com> | 2010-01-26 10:11:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-26 10:11:30 -0800 |
| commit | 5b7ea0146dcfd5564d894d4cf0104919775feb36 (patch) | |
| tree | de8d840fd5a0bf6e8ae9d9c71387d25f596116d4 /opengl/java/android/opengl/Texture.java | |
| parent | c811cd916f7264f11ba4c96fcd8b88e5d58e04db (diff) | |
| parent | e7b2845d685a583e8e84de369b6acfa1bebeabf4 (diff) | |
am e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2
Merge commit 'e7b2845d685a583e8e84de369b6acfa1bebeabf4' into eclair-mr2-plus-aosp
* commit 'e7b2845d685a583e8e84de369b6acfa1bebeabf4':
DO NOT MERGE
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions