Merge "Reduce RGBA coversion code duplication."
authorJarkko Pöyry <jpoyry@google.com>
Wed, 20 May 2015 19:37:30 +0000 (19:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 20 May 2015 19:37:32 +0000 (19:37 +0000)

Trivial merge