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


Trivial merge