am 60ce86ed: Merge "Avoid leaking VAO in compute_interop tests." into lmp-mr1-dev
authorJarkko Pöyry <jpoyry@google.com>
Fri, 30 Jan 2015 02:26:52 +0000 (02:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Jan 2015 02:26:52 +0000 (02:26 +0000)
* commit '60ce86edd4316c2e96b35d94844d870cdfa99d55':
  Avoid leaking VAO in compute_interop tests.


Trivial merge