commit | 2d15f81ee8355218131ab4049a8d5659d2665330 | [log] [tgz] |
---|---|---|
author | Mahaver Chopra <mahaver@google.com> | Tue May 24 12:38:04 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue May 24 12:38:04 2016 +0000 |
tree | 9aedce2e677f4f8b4677af2f17750021aaceff5b | |
parent | ce16ccb7929b796ea77619d1cdd8b0f838c4556b [diff] | |
parent | 150dd9cc4fecbfd58db2f9e994077b9968368a2b [diff] |
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev am: e6e8c92134 am: 150dd9cc4f * commit '150dd9cc4fecbfd58db2f9e994077b9968368a2b': Disallow OEM unlock when DISALLOW_FACTORY_RESET applies Change-Id: I386ad26655446801d1b6a221cdb8c6446b5a6ba9