tree b601f8c7a768f2ea77490a3d324de6f877360491
parent d2ba6ec3fc612b524d4bdff8ce318ade4909d391
parent dc20ba69bf5f6e1017202555b6159abaf67b855c
author Steven Ng <stevenckng@google.com> 1463138877 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1463138879 +0000

Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev