tree c90432e3862fdebaac2d2e167cc9da975d39a27e
parent f67dcd9526bd7832fd69041eec2e03a3a3b92b9d
parent ddc1598871be09e132dc49dba011d38007c4335b
author Chet Haase <chet@google.com> 1438880212 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438880212 +0000

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

* commit 'ddc1598871be09e132dc49dba011d38007c4335b':
  Avoid changing internal state of shared drawable