am 3edf4274: Merge "Fix -Wconversion warnings in color clear tests."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 19:41:29 +0000 (19:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 19:41:29 +0000 (19:41 +0000)
* commit '3edf42747cd865f990b488fcfbb49ae36f474c28':
  Fix -Wconversion warnings in color clear tests.


Trivial merge