am 5998be16: Merge "Improve glFlush() & glFinish() tests" into mnc-dev
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:33:08 +0000 (19:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:33:08 +0000 (19:33 +0000)
am: 25ceee422c

* commit '25ceee422c574d21eef06b71c2246783a3c808f3':


Trivial merge