am a89a059e: am 04104665: Merge change I911458a0 into eclair
am a89a059e: am 04104665: Merge change I911458a0 into eclair

Merge commit 'a89a059ea7f4cb3180feaa131eda4713974c3873' into eclair-mr2-plus-aosp

* commit 'a89a059ea7f4cb3180feaa131eda4713974c3873':
  Fix x offset for boxed textures

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