tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 340e61073bd1b4be66c600a4332a81eac6029d7e
parent 0736b9c4c0b6df9ada82d39f4a8cf70c98849b13
author Adam Cohen <adamcohen@google.com> 1422685361 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685361 +0000

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

* commit '0736b9c4c0b6df9ada82d39f4a8cf70c98849b13':