tree 6f5189cff85f15699b3076fe0f4b2f4a736139de
parent 68eb6f7bae63b7d6f1de4aa8000a9c44cfb87d95
parent 11b85a283b7dd11d21aa614e9f0bf2652a4316d3
author Dharmesh Mokani <mokani@google.com> 1409170554 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409170555 +0000

Merge "Remove StopShip from UserManagerCompactVl file." into ub-now-porkchop