tree fee8b972aeca9452e5ca26201b10c081a7a93673
parent ba4814a49c0937c76cb4ecd1742032b8469a4bf6
parent 890f20e8e84e91173edf6890f5bb6da5cd0418d2
author George Mount <mount@google.com> 1414102702 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414102702 +0000

am 890f20e8: am 039cc060: am 82fd8428: Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev

* commit '890f20e8e84e91173edf6890f5bb6da5cd0418d2':
  Protect against ImageView changing to a null Drawable during Transition.