OSDN Git Service

Merge \"Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED.\" into...
authorMahaver Chopra <mahaver@google.com>
Wed, 13 Jul 2016 12:33:59 +0000 (12:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Jul 2016 12:33:59 +0000 (12:33 +0000)
commite64f60a455f19180a56577ed2d55cc01578657a9
treea761b8ca854fc23f26fbbbc0d8ca0545431e9cb5
parentee2f46485e5bc92e46f486c0e118463ca5e6c2ca
parent695a1c50a274c4ba423d910d3d4167a7493a6ea1
Merge \"Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED.\" into nyc-mr1-dev
am: 695a1c50a2

Change-Id: I8976511deb994983abbb17b2830b98878c92631b
core/java/android/provider/Settings.java
core/res/res/values/config.xml