am a4aa677d: am b263450f: am 3662f9ee: Merge change Ide4c8cbc into eclair
am a4aa677d: am b263450f: am 3662f9ee: Merge change Ide4c8cbc into eclair

Merge commit 'a4aa677db36651e806f38e8aa7e8532da4f06b0d'

* commit 'a4aa677db36651e806f38e8aa7e8532da4f06b0d':
  fix [2151588] glTexSubImage2D() allows pixel format conversion

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