tree eac8841734aa1685d70882428b709ff19d13cd52
parent 1b2bc40bc9db13752fd362a9ac6d43fa07cde668
parent a9e460aefcf3891af5acc7d8ae74da9eed49bfbd
author Robin Lee <rgl@google.com> 1400682098 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1400682098 +0000

Merge "Remove enforceManagedProfile for listing keyguard features"