tree 10da860fcff71886af91d082e31f0e1917926848
parent 30ebce48b1640965674e8cf64f288e6412604b33
parent 93423259c990af4b5ce7268c209cfa20bc6d36c2
author Dharmesh Mokani <mokani@google.com> 1422666483 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666483 +0000

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

* commit '93423259c990af4b5ce7268c209cfa20bc6d36c2':