am ca905c33: Merge "Fix -Wconversion warnings in VAO tests."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 21:02:26 +0000 (21:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 21:02:26 +0000 (21:02 +0000)
* commit 'ca905c3314629e27ad42733d2db76860122f29ea':
  Fix -Wconversion warnings in VAO tests.


Trivial merge