tree c028bfe537607823c37e2ffc8c713c73059d3130
parent d6662e7837482396e061ebc1c4bfcdb774f09f7a
parent 52985def455cd7d5875ca77bff3f6f18cde42900
author Dharmesh Mokani <mokani@google.com> 1422685314 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685314 +0000

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

* commit '52985def455cd7d5875ca77bff3f6f18cde42900':