tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent ca4f3f09e34e6807b76d7db5c28545bde5f4f8c0
parent d78b020cc0336ec36d5bdc17ee7237b0aeb67866
author Dharmesh Mokani <mokani@google.com> 1422669694 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669694 +0000

am d78b020c: am 93423259: am 74dc410b: Merge "Remove StopShip from UserManagerCompactVl file." into ub-now-porkchop

* commit 'd78b020cc0336ec36d5bdc17ee7237b0aeb67866':