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

* commit '1c164c5b22b1504cfcf746efe3e06400dcd60de1':


Trivial merge