Merge "Fix broken toRGBAMasked."
authorJarkko Pöyry <jpoyry@google.com>
Thu, 2 Apr 2015 19:08:03 +0000 (19:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 2 Apr 2015 19:08:03 +0000 (19:08 +0000)

Trivial merge