tree ccbfaf6ddcdfec78f23262150db16f171ea82efe
parent 8596f6998eddb0caa35532eb386ac6d00f81551d
parent df35d570ed25257c6782e632ab1bae5e1603855a
author Alexandra Gherghina <alexgherghina@google.com> 1398941361 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1398941361 +0000

Merge "Adds an enabled state in UserInfo instead of DevicePolicyManager"