Merge "Fix -Wconversion warnings in framework/randomshaders."
authorJarkko Pöyry <jpoyry@google.com>
Thu, 21 May 2015 23:58:32 +0000 (23:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 May 2015 23:58:33 +0000 (23:58 +0000)
commita29f7330e5212fb9d3421eaf2aa148ddf5d2638d
treecb3049f3eb5dcee06572f58011f8d5a4fafd2ef0
parentd844dc30e3ddbe70d32f5997259a7f971e0986d8
parentba84b6ddb4fa9742f31bca9e48777387989f65d8
Merge "Fix -Wconversion warnings in framework/randomshaders."