OSDN Git Service

Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev
authorSteven Ng <stevenckng@google.com>
Mon, 16 May 2016 09:20:42 +0000 (09:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 16 May 2016 09:20:43 +0000 (09:20 +0000)

Trivial merge