| commit | 950de0e40aa1c21dc69c64980fa4dab2f1c68eb7 | [log] [tgz] |
|---|---|---|
| author | Andres Morales <anmorales@google.com> | Tue Mar 22 21:20:43 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 22 21:20:43 2016 +0000 |
| tree | fbab56aac50f052e39ced4f1c0ea044b8f1eff98 | |
| parent | 9c867a5703e36f47ec0f6b52fd1dc8b7d3110802 [diff] | |
| parent | 0bb6f70a8789a0b89beaf01ee463f63fc6876ba8 [diff] |
Merge "don't toggle OEM unlocking if the preference is not enabled" into nyc-dev