am: e6e8c92134
* commit 'e6e8c92134b7a212058d7728007407eb74720625':
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
Change-Id: I2389a5518a55fc3131a91fb5a5d8af376d79d936
am: e6e8c92134
* commit 'e6e8c92134b7a212058d7728007407eb74720625':
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
Change-Id: I2389a5518a55fc3131a91fb5a5d8af376d79d936