OSDN Git Service

Merge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev am...
authorFan Zhang <zhfan@google.com>
Wed, 24 Aug 2016 02:33:39 +0000 (02:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 02:33:39 +0000 (02:33 +0000)
am: a9d2aa8dfa

Change-Id: I6eecc24f52e48900620058f7c4142275ad391d22


Trivial merge