| commit | dd86aa141e02ffaf277996fc1701141ea13e090e | [log] [tgz] |
|---|---|---|
| author | Mahaver Chopra <mahaver@google.com> | Tue May 24 12:22:49 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 24 12:22:51 2016 +0000 |
| tree | 50314cf32b06b58fe841810b934da6bb0b646a09 | |
| parent | a44129dd5518c1890f2301baea7e03972408e270 [diff] | |
| parent | 830e32cdccdeeeadc5f07ba006b2b5779f8be65d [diff] |
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev