tree cd5d9c83c92574f06438d1a2c9e282299fb6e5c4
parent 18eedbacac964f200309f99fdfca06a0a01e5bf5
parent 04104665271248719cb3659e42938fa4bec0261e
author Marco Nelissen <marcone@google.com> 1256849167 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256849167 -0700

am 04104665: Merge change I911458a0 into eclair

Merge commit '04104665271248719cb3659e42938fa4bec0261e' into eclair-mr2

* commit '04104665271248719cb3659e42938fa4bec0261e':
  Fix x offset for boxed textures