am e1f7bcc7: am ad822197: Merge change 23380 into eclair
am e1f7bcc7: am ad822197: Merge change 23380 into eclair

Merge commit 'e1f7bcc7ab422e2bc87137648dc67250d116b0c6'

* commit 'e1f7bcc7ab422e2bc87137648dc67250d116b0c6':
  Change util_texSubImage2D to call glCompressedTexImage2D correctly.

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