am b2c315eb: am 6a73368b: Merge "fix a typo that prevented glTexImage2D codepath to work" into gingerbread
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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base