tree 6f5189cff85f15699b3076fe0f4b2f4a736139de
parent 22f863d2b7ed8cd16867d57d81c7f54e4319ba40
parent 93423259c990af4b5ce7268c209cfa20bc6d36c2
author Dharmesh Mokani <mokani@google.com> 1409222747 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409222747 +0000

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

* commit '93423259c990af4b5ce7268c209cfa20bc6d36c2':
  Remove StopShip from UserManagerCompactVl file.