summaryrefslogtreecommitdiff
path: root/opengl/libagl/texture.cpp
diff options
context:
space:
mode:
author Dirk Dougherty <ddougherty@google.com> 2010-01-28 16:46:54 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-01-28 16:46:54 -0800
commitf1e2b83c0ad6dbfc35b3c29c1c1129154ff5826a (patch)
treef4d901d22f470e7d421cde73033da6a191f7db17 /opengl/libagl/texture.cpp
parent642a0cb05476736ecb19c98eee58c63c04ba37e0 (diff)
parentd08c5fb5c881d63895a63d7acc99021fa8361c5d (diff)
am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair
Merge commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e' into eclair-plus-aosp * commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e': SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
Diffstat (limited to 'opengl/libagl/texture.cpp')
0 files changed, 0 insertions, 0 deletions