tree 301ba9b4cd53c6178fb182c9219de3da8e9ed1c5
parent 92b8cbd47288143d28c12979b7fc3227ff21e1e8
parent f1d9152f9f07dda8d3a609438345ab9773608bff
author Sudheer Shanka <sudheersai@google.com> 1468350695 +0000
committer android-build-merger <android-build-merger@google.com> 1468350695 +0000

Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-mr1-dev
am: f1d9152f9f

Change-Id: I61633ebe7944d54f3da36eedaf4bab7308ff3c96