summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-08-16 15:17:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-16 15:17:59 -0700
commit2565c5b6ef6c9020e8c4b9454ea9ac1b92bdf390 (patch)
treecf2fc0a22920d2625ad0e99e3f6106237a8493f7 /media
parentfb5d9e7c2a0f48d03d1c2600ac36792f13f1d981 (diff)
parentb2c315ebe79359fa443533f9ab55e9b730938e41 (diff)
downloadframeworks_base-2565c5b6ef6c9020e8c4b9454ea9ac1b92bdf390.zip
frameworks_base-2565c5b6ef6c9020e8c4b9454ea9ac1b92bdf390.tar.gz
frameworks_base-2565c5b6ef6c9020e8c4b9454ea9ac1b92bdf390.tar.bz2
am b2c315eb: am 6a73368b: Merge "fix a typo that prevented glTexImage2D codepath to work" into gingerbread
Merge commit 'b2c315ebe79359fa443533f9ab55e9b730938e41' * commit 'b2c315ebe79359fa443533f9ab55e9b730938e41': fix a typo that prevented glTexImage2D codepath to work
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions