| commit | 150dd9cc4fecbfd58db2f9e994077b9968368a2b | [log] [tgz] |
|---|---|---|
| author | Mahaver Chopra <mahaver@google.com> | Tue May 24 12:31:57 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 24 12:31:57 2016 +0000 |
| tree | b8f6caac1df9dc244420e0056a1370fa0e2216a3 | |
| parent | 534d85645849a84b122d8a2d1ec7b7bf413ad956 [diff] | |
| parent | e6e8c92134b7a212058d7728007407eb74720625 [diff] |
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev am: e6e8c92134 * commit 'e6e8c92134b7a212058d7728007407eb74720625': Disallow OEM unlock when DISALLOW_FACTORY_RESET applies Change-Id: I2389a5518a55fc3131a91fb5a5d8af376d79d936