summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Texture.java
diff options
context:
space:
mode:
authorMarc Blank <mblank@google.com>2010-04-29 15:40:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-29 15:40:30 -0700
commit9ca816649bd2af7d540f375be8fcc503c50aef72 (patch)
tree77cd2d6f51e7d272e38bd4e23f615849d08bca57 /opengl/java/android/opengl/Texture.java
parent48399e38c978a66ac4c6054c8681a246dfc94b4b (diff)
parent794cd640bfa8c6d82803b59bc18cbd73627a8162 (diff)
am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo
Merge commit '794cd640bfa8c6d82803b59bc18cbd73627a8162' into froyo-plus-aosp * commit '794cd640bfa8c6d82803b59bc18cbd73627a8162': Expose _id in ExtendedProperties subValues
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions