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

* commit '956f2d95d451ac4074be2bf56266d3c69de93df1':


Trivial merge