am 3894a568: Merge "Remove flush_wait test as glFlush does not flush on all platforms...
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:36:37 +0000 (19:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:36:37 +0000 (19:36 +0000)
am: 90c3f00b4f

* commit '90c3f00b4f0fc4bcb70b0bd4eb1299ebe50092ba':


Trivial merge