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)
commit53aea81ea61a4f8452c2cef4c5b9898e857ba5c3
tree31b8b05cb42abd7d783ceed5147e52d0e1dd5f95
parent7df564df0b29eee82320e87ebecf07fb809a700b
parentca905c3314629e27ad42733d2db76860122f29ea
am ca905c33: Merge "Fix -Wconversion warnings in VAO tests."

* commit 'ca905c3314629e27ad42733d2db76860122f29ea':
  Fix -Wconversion warnings in VAO tests.