am 25ceee42: am 5998be16: Merge "Improve glFlush() & glFinish() tests" into mnc-dev
authorPyry Haulos <phaulos@google.com>
Thu, 7 May 2015 08:18:27 +0000 (08:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 May 2015 08:18:27 +0000 (08:18 +0000)
* commit '25ceee422c574d21eef06b71c2246783a3c808f3':
  Improve glFlush() & glFinish() tests


Trivial merge