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:41:29 +0000 (19:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:41:29 +0000 (19:41 +0000)
am: ac616f6dd0

* commit 'ac616f6dd07b1d95206a6969781837cb21176019':


Trivial merge