commit | 534376f3e9e302946d6f5aae883748107d466c50 | [log] [tgz] |
---|---|---|
author | Esteban Talavera <etalavera@google.com> | Thu Aug 11 19:11:58 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 11 19:11:58 2016 +0000 |
tree | 6f24a2e69928d029f317a58d3d501cdfe76f90aa | |
parent | 50421f1a381a5f4ce06e3a3ea5d30c5606a1dedf [diff] | |
parent | 5d8bd029a88ab8d735514f6afca27f4a3c5ff504 [diff] |
Merge "Do not toggle OEM unlock if bootloader unlocked" into nyc-mr1-dev am: fd97e7bc8c am: 5c96b0d1ab am: 5d8bd029a8 Change-Id: I6dc9d8a52c948cd0cdd97ad7af2cb44c0bca76c5