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)
commit8c0e036eaa7f9473b2900ecbd90e519d30ceb357
tree8dfc7575ed2e3acb7a6bd6d08784d17297915c34
parent029a2ee2fbea8b445d198d140a694938cff3950b
parent3edf42747cd865f990b488fcfbb49ae36f474c28
am 3edf4274: Merge "Fix -Wconversion warnings in color clear tests."

* commit '3edf42747cd865f990b488fcfbb49ae36f474c28':
  Fix -Wconversion warnings in color clear tests.