tree afeba40e7a527d9eed832342b5c07b1003d1bb82
parent aa5f515b1ad2a63e9b32b7fe047f60356ae63744
parent 12b0496944381437a1e9974b0e79f56e766bbbdc
author Lenka Trochtova <ltrochtova@google.com> 1481648698 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1481648702 +0000

Merge "Make UserManager#DISALLOW_OEM_UNLOCK a system API."