tree ad09e054fa76f321596d9c06865d964e553f51ea
parent 2a0d4a1fffbd99e91bda19f3139625f9933035ca
parent 4a9c3891d4f890109e02bc83fecf9bcdf56a9395
author Mike Reed <reed@google.com> 1404763050 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1404331208 +0000

Merge "kNative_8888_SkColorType is now kN32_SkColorType"