| commit | 52985def455cd7d5875ca77bff3f6f18cde42900 | [log] [tgz] |
|---|---|---|
| author | Dharmesh Mokani <mokani@google.com> | Sat Jan 31 02:01:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 02:01:34 2015 +0000 |
| tree | 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25 | |
| parent | ca4f3f09e34e6807b76d7db5c28545bde5f4f8c0 [diff] | |
| parent | d78b020cc0336ec36d5bdc17ee7237b0aeb67866 [diff] |
am d78b020c: am 93423259: am 74dc410b: Merge "Remove StopShip from UserManagerCompactVl file." into ub-now-porkchop * commit 'd78b020cc0336ec36d5bdc17ee7237b0aeb67866':