From: Steven Ng Date: Mon, 16 May 2016 09:20:42 +0000 (+0000) Subject: Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev X-Git-Tag: android-x86-7.1-r1~745 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=030060a32166990585cf0ef2c007e7f787e5dd7d;p=android-x86%2Fpackages-apps-Settings.git Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev --- 030060a32166990585cf0ef2c007e7f787e5dd7d