tree 528b5d7a73c0fa032211dc90beaf8f7f27a74bf4
parent 6b7eecfb46bc265579f299d347f8f89f85253d6d
parent 70cac15eacd3524d758bcb0dbd394772f2bbc5a0
author David Turner <digit@android.com> 1313277243 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1313277243 -0700

am 70cac15e: am d2c5f503: Merge "opengles emulator: fix the uniform location WAR for intel platforms"

* commit '70cac15eacd3524d758bcb0dbd394772f2bbc5a0':
  opengles emulator: fix the uniform location WAR for intel platforms