| commit | e6e8c92134b7a212058d7728007407eb74720625 | [log] [tgz] |
|---|---|---|
| author | Mahaver Chopra <mahaver@google.com> | Tue May 24 12:23:20 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 24 12:23:20 2016 +0000 |
| tree | 4fd5df6408a9a19b885da149f8458a87e59323b9 | |
| parent | 3b15d6234dc9097869030c1e5e2b26a9b34d1f19 [diff] | |
| parent | dcf3d7c185a2b6c7eaf13f0ea9a866338fd40fd6 [diff] |
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev