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

Merge commit '923f2cf0dc15ac2bafa8013b31a722b85a64176b'

* commit '923f2cf0dc15ac2bafa8013b31a722b85a64176b':
  Fix x offset for boxed textures
tree: 1d3943ea90b72c58fc997123f41a996f15bb311f
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE