OSDN Git Service

Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev
authorMahaver Chopra <mahaver@google.com>
Tue, 24 May 2016 12:22:49 +0000 (12:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 24 May 2016 12:22:51 +0000 (12:22 +0000)

Trivial merge