tree cba62d0d64153aa2169651696bc238591341d679
parent a3dd7f1fcc086146643b6edc5aa37dbf5343d2ff
parent 5e9680e976ea61a0d2e957c1f91e6a8a417e89d5
author Adam Cohen <adamcohen@google.com> 1414085117 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085117 +0000

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 '5e9680e976ea61a0d2e957c1f91e6a8a417e89d5':