tree c1cafbbe1a06fc74c4dc503956188321d793d33f
parent af861ab87925e64b93c91bcea428f68ee0738772
parent b933055cf3f7f8ea89bfd3bc9c37a3891ff7310a
author Mike Reed <reed@google.com> 1403296648 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1403224235 +0000

Merge "stop using (deprecated) SkBitmap::Config"