OSDN Git Service

Merge \"Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED\" into...
authorMahaver Chopra <mahaver@google.com>
Wed, 13 Jul 2016 12:34:04 +0000 (12:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Jul 2016 12:34:04 +0000 (12:34 +0000)
commitfae757cb1c2878be6808a6b21d0655867d5f7e18
tree83202dd22107439143d1b6aa4a136941dd8623ef
parent85a11e7f82001e960c081f8648a5fbac7f887756
parentec618dc585d8e2f89cc107769cfb9fb313e7fd93
Merge \"Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED\" into nyc-mr1-dev
am: ec618dc585

Change-Id: Ide526f716b96a73635853d621bef61d09ff04425
src/com/android/settings/DevelopmentSettings.java