am b2c315eb: am 6a73368b: Merge "fix a typo that prevented glTexImage2D...
am b2c315eb: am 6a73368b: Merge "fix a typo that prevented glTexImage2D codepath to work" into gingerbread
Merge commit 'b2c315eb'
* commit 'b2c315eb':
fix a typo that prevented glTexImage2D codepath to work