tree 6d0cf50bcb546bbdbcd33069dab1dd4f6bd98001
parent ac598888e3efbb6fda910ac8bef3bc92811309ba
parent 26478bad42dd3d446131ae65ee0bf6880a950889
author Alan Viverette <alanv@google.com> 1415827241 +0000
committer android-build-merger <android-build-merger@google.com> 1415827241 +0000

Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev
automerge: 26478ba

* commit '26478bad42dd3d446131ae65ee0bf6880a950889':
  Fix default attributes in ScaleDrawable