tree 6de311e91fa2ea0d9ed8b6ba1119b8db00bb3a40
parent 8c764ac4476aafc0913a08726734eb6905121655
parent e79b525d8bb342967bb211cc8a14985ffca9f0af
author David Turner <digit@android.com> 1312909607 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312909607 -0700

am e79b525d: am bf13fc81: Merge "opengles emulator: fix bugs in CUBE_MAP implementation in GLES_CM"

* commit 'e79b525d8bb342967bb211cc8a14985ffca9f0af':
  opengles emulator: fix bugs in CUBE_MAP implementation in GLES_CM