am a29f7330: Merge "Fix -Wconversion warnings in framework/randomshaders."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 00:12:53 +0000 (00:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 00:12:53 +0000 (00:12 +0000)
commit91f1c7b7a6c02203d206932b4d268d5d54daacae
treeb46979b493ae145d1e7407db8654f929c6e19ff5
parent19a142e03ace7295e36880d8a5770bc85162666e
parenta29f7330e5212fb9d3421eaf2aa148ddf5d2638d
am a29f7330: Merge "Fix -Wconversion warnings in framework/randomshaders."

* commit 'a29f7330e5212fb9d3421eaf2aa148ddf5d2638d':
  Fix -Wconversion warnings in framework/randomshaders.