tree 9a8d00d6cc713f05d9d2fcece53a91313412d2b1
parent 34552f4cf8796a27666d7abbdaeff8a39a2bdbf3
parent f149b4f0650c1a96eb13c6c0db2b493ac57c75aa
author David Turner <digit@android.com> 1313277051 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1313277051 -0700

am f149b4f0: Merge "opengl emulator: fix windows build"

* commit 'f149b4f0650c1a96eb13c6c0db2b493ac57c75aa':
  opengl emulator: fix windows build