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:30:44 +0000 (12:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 May 2016 12:30:44 +0000 (12:30 +0000)
commit4545f9138e765b127c5d9b2e9eb24b074a4850fa
tree3ca251ce5c2e1e8e99a0ebac13d08742faf8ee68
parentf076687f67596f8866cb8b5e2f2a14ad22b22fda
parentdd86aa141e02ffaf277996fc1701141ea13e090e
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev
am: dd86aa141e

* commit 'dd86aa141e02ffaf277996fc1701141ea13e090e':
  Disallow OEM unlock when DISALLOW_FACTORY_RESET applies

Change-Id: I077fd5c067c453a4dcd161ba582e473ade1a8392