tree dc8de6beaceb65dcc79db2da6d976aac6429e7d4
parent afcd49611e8adcbd159ccf480963d143c10f36ba
parent 45bdf81a48253c90797e99794323c8ece9806a50
author Jeff Brown <jeffbrown@google.com> 1412746545 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412746545 +0000

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

* commit '45bdf81a48253c90797e99794323c8ece9806a50':
  Reapply animation duration scale each time it is started.