tree 90726b2477781a7575c57e322aef8497c5112dfa
parent 1ec739a5cb06da1ca2e3daa101fb5bb1746da162
parent 9f67b0255760fb20ab1eb2b5ddf3f9085d2f1203
author Adam Cohen <adamcohen@google.com> 1392411614 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411614 +0000

am 9f67b025: am cc364275: am cd3b8ccf: am 401dc411: (-s ours) am 4d3f022c: (-s ours) Merge "DO NOT MERGE: Fix leak when animations are created but never started" into jb-ub-now-indigo-rose

* commit '9f67b0255760fb20ab1eb2b5ddf3f9085d2f1203':