tree 615b13fff624bd0282d5ef81f23551f06e924cdb
parent 4a2d903c6aa09be4874e393e3564fa3e2d65c347
parent 19756f43cb5c74042f176a6385d501b078cfa419
author David Turner <digit@android.com> 1310408495 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1310408495 -0700

am 19756f43: am d0e43fbd: am b6d01e32: Merge "emulator opengl: fixing clean windows build"

* commit '19756f43cb5c74042f176a6385d501b078cfa419':
  emulator opengl: fixing clean windows build