tree 3362185ad651050bfd4c420ea511a7aa679a4b0d
parent 351c3bd16b4c23d267f3dc2c00a555a82fd7e77e
parent 42c70645d28f07db145e02fd4a11af99c6437936
author Chet Haase <chet@google.com> 1438879472 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438879472 +0000

am 42c70645: am aed2e8ba: am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev

* commit '42c70645d28f07db145e02fd4a11af99c6437936':
  Avoid changing internal state of shared drawable