tree cba62d0d64153aa2169651696bc238591341d679
parent e1dc54300c71e8c2884e08044a64078134aae4d2
parent 9f67b0255760fb20ab1eb2b5ddf3f9085d2f1203
author Adam Cohen <adamcohen@google.com> 1414085379 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085379 +0000

am 9f67b025: (-s ours) 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':