summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Texture.java
diff options
context:
space:
mode:
authorRobert Greenwalt <robdroid@android.com>2009-11-24 15:23:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-24 15:23:42 -0800
commit12715c366c69b54b3e5218fd25647980a6502be0 (patch)
tree73a6a53d396d106b635244b8a319ae7c251e330e /opengl/java/android/opengl/Texture.java
parent80d5fc0f5add0c42e617ea6f4318b8a2b61370df (diff)
parent8e2eb583e73e1e4813999bc0f49cc26d8d63bcb8 (diff)
am 8e2eb583: Merge change I22cf0509 into eclair-mr2
Merge commit '8e2eb583e73e1e4813999bc0f49cc26d8d63bcb8' into eclair-mr2-plus-aosp * commit '8e2eb583e73e1e4813999bc0f49cc26d8d63bcb8': Add China data to MccTable.
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions