tree 10da860fcff71886af91d082e31f0e1917926848
parent 75df44031ff50ac984acbac56823fcb7d10ad66a
parent 3505ad1af337f4f23eb517c89ed6ce9309be92df
author Adam Cohen <adamcohen@google.com> 1414566299 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566299 +0000

am 3505ad1a: (-s ours) 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 '3505ad1af337f4f23eb517c89ed6ce9309be92df':