tree cba62d0d64153aa2169651696bc238591341d679
parent 38941ad1a9cfe521e1e95a663d0013cb2f3805ae
parent 35007abdc566d5639d779253d590cf1810cfb325
author Michael Jurka <mikejurka@google.com> 1414085456 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085456 +0000

am 35007abd: am af3064d8: am dd12202f: am 19d10a58: Don\'t adjust animation play time if not necessary

* commit '35007abdc566d5639d779253d590cf1810cfb325':