tree 10da860fcff71886af91d082e31f0e1917926848
parent eb1540a51318fbb40023261ab7e7a4d16fc0c1c7
parent 0d89e1d764216baf4e57f1dee7bbf7b3c462be97
author Adam Cohen <adamcohen@google.com> 1422666543 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666543 +0000

am 0d89e1d7: am ddd5aaaf: Merge "Perform null check in animation complete" into ub-now-porkchop

* commit '0d89e1d764216baf4e57f1dee7bbf7b3c462be97':