am 3f756478: Merge "Reduce RGBA coversion code duplication."
authorJarkko Pöyry <jpoyry@google.com>
Wed, 20 May 2015 19:50:12 +0000 (19:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 20 May 2015 19:50:12 +0000 (19:50 +0000)
* commit '3f756478ade3e90fc42e04a04977a4ddccf23315':
  Reduce RGBA coversion code duplication.


Trivial merge