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

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