Merge \\\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\\" into lmp-dev am: e64034a27d -s ours am: db7e70c2f0 am: e0cc5e20ae am: 0d457d1254 -s ours am: 199f6a490a am: 06c3f60136 am: 9088be4ebe am: 95c9bef53b -s ours

am: 00e79982aa

Change-Id: I1e8813e048525dc575f869a8c921ad28ed104db8
This commit is contained in:
Sudheer Shanka
2016-06-21 23:56:49 +00:00
committed by android-build-merger

Diff Content Not Available