tree da32ac33e7e637c4d0ca64ca2e66c851b88d79fc
parent ff3f9cf279bcfaab8597fcbaaa22dabc8c0f497d
parent baffc8892440bcdf43c90aa74e301bd3d16a795a
author Julia Reynolds <juliacr@google.com> 1406127244 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406127244 +0000

am baffc889: Merge "Lockdown \'remove user\' with user restriction in Settings for phones." into lmp-dev

* commit 'baffc8892440bcdf43c90aa74e301bd3d16a795a':
  Lockdown 'remove user' with user restriction in Settings for phones.