tree 10da860fcff71886af91d082e31f0e1917926848
parent bf3762e3fc2e3d59bd5e62bde6a8959df187ff3b
parent 3c20ac972466e69e7f9d952eed3506938a40fa18
author Michael Jurka <mikejurka@google.com> 1414566339 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566339 +0000

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

* commit '3c20ac972466e69e7f9d952eed3506938a40fa18':