tree 287baf94b4061d44880f7a442411c2ccbd867600
parent e651ee9bef73c00c3ca1f1ed57485a6c06b802fd
parent bc635a2574430f345aaa042e003935f315788304
author Alan Viverette <alanv@google.com> 1441370402 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441370402 +0000

am bc635a25: am 3d632546: (-s ours) Merge "Update mFillPaint color on GradientDrawable inflation"

* commit 'bc635a2574430f345aaa042e003935f315788304':
  Update mFillPaint color on GradientDrawable inflation