am 071e3222: Merge "Fix -Wconversion warnings in rendering tests."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 19:55:56 +0000 (19:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 19:55:56 +0000 (19:55 +0000)
* commit '071e32225dee3779822e20cdb1dae0d5647804b6':
  Fix -Wconversion warnings in rendering tests.


Trivial merge