tree c05dc1714cc18f3b59f3507ca8a8e220296a8287
parent 7ce39022b6cda755c68270783090e413e3fb50f0
parent 66959dc1b6c98a5c24ec6069af4058498d5b1f48
author David Turner <digit@android.com> 1309963872 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1309963872 -0700

am 66959dc1: am 38c1e495: am deebe1a6: Merge "opengl renderer: windows runtime fix"

* commit '66959dc1b6c98a5c24ec6069af4058498d5b1f48':
  opengl renderer: windows runtime fix