tree 815ab368bbf92f8d9dea46928a3a69eec39ee184
parent b47ea9b2ed24f8eb6fc8b338555ff0d8825d8565
parent 906c8dea2ec6ae404ae6d7870c0a0cb2289f3d04
author John Reck <jreck@google.com> 1438722803 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438722803 +0000

am 906c8dea: am bc04d3ac: Merge "animateNoDamage failed to remove from current frame list"

* commit '906c8dea2ec6ae404ae6d7870c0a0cb2289f3d04':
  animateNoDamage failed to remove from current frame list