am 6b532800: Merge change 6478 into donut

Merge commit '6b5328006ff9e844713eb26b40621d72bee0bdd1'

* commit '6b5328006ff9e844713eb26b40621d72bee0bdd1':
  Fix ShapeDrawable.inflateTag() to accept proper dimension specs for padding