tree a05fa6b79d10e415dc77ee9c69e904ff271b384c
parent b4849f8d748fb9f682833f54377ced48c26fb96e
parent 177422c91e392201beff0bd7b8e5edf6fc2c40eb
author Sudheer Shanka <sudheersai@google.com> 1468351234 +0000
committer android-build-merger <android-build-merger@google.com> 1468351234 +0000

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

Change-Id: I7de2c4181d5b42e505310b4639eb82719ae42c16