am 45bfbfc3: am 90c3f00b: am 3894a568: Merge "Remove flush_wait test as glFlush does...
authorKalle Raita <kraita@google.com>
Thu, 11 Jun 2015 02:06:07 +0000 (02:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Jun 2015 02:06:07 +0000 (02:06 +0000)
* commit '45bfbfc3ef03aad50be12a9d6565b7e803262e61':
  Remove flush_wait test as glFlush does not flush on all platforms.


Trivial merge