tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 398ccb6023891fb3fd43f16e2367ab468eacc4c6
parent bab1243e5d4c0b9432a244d2d0e97cd3db007162
author Adam Cohen <adamcohen@google.com> 1422669732 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669732 +0000

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

* commit 'bab1243e5d4c0b9432a244d2d0e97cd3db007162':