tree 0f3e423636595bedf2535ec4053e5e5d2faff486
parent b4e7044bcd58e4633c009068093d35f9fcceb0d4
parent 32b9f4a650d1b8b52b85a27109f95fde030dff66
author Jeff Brown <jeffbrown@google.com> 1412726321 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412726321 +0000

am 32b9f4a6: Merge "Reapply animation duration scale each time it is started." into lmp-dev

* commit '32b9f4a650d1b8b52b85a27109f95fde030dff66':
  Reapply animation duration scale each time it is started.