am 6a73368b: Merge "fix a typo that prevented glTexImage2D codepath to work" into gingerbread

Merge commit '6a73368be44f45a80cc4b65dc57b9ff529cb2d89' into gingerbread-plus-aosp

* commit '6a73368be44f45a80cc4b65dc57b9ff529cb2d89':
  fix a typo that prevented glTexImage2D codepath to work