tree 10da860fcff71886af91d082e31f0e1917926848
parent a42b3718f5d17634c5a4852b8fd8d399f65c7c38
parent 1d56243748aec4c854bd79d5963b2217d14d591e
author Adam Cohen <adamcohen@google.com> 1414566067 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566067 +0000

am 1d562437: (-s ours) am 5e9680e9: (-s ours) am d53e22d2: am 4d3f022c: Merge "DO NOT MERGE: Fix leak when animations are created but never started" into jb-ub-now-indigo-rose

* commit '1d56243748aec4c854bd79d5963b2217d14d591e':