tree 89ad4915fb1b0e4e93ab86706bd47ae643ed69c3
parent 016e0091d66781c131fbc29a156b464b1151c5c8
parent d56554e82b591357cbb819859ddcc7b87ff7306b
author John Reck <jreck@google.com> 1438723395 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438723395 +0000

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

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