commit | 5d8bd029a88ab8d735514f6afca27f4a3c5ff504 | [log] [tgz] |
---|---|---|
author | Esteban Talavera <etalavera@google.com> | Thu Aug 11 19:00:40 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 11 19:00:40 2016 +0000 |
tree | 6d5546b629a1d89c79b2b8f9dbf2b96358c466ff | |
parent | b9bef2fb7d5f216caa5bd64d8e26041051327199 [diff] | |
parent | 5c96b0d1abd4e5fe450fb155f62febacec6d2e7c [diff] |
Merge "Do not toggle OEM unlock if bootloader unlocked" into nyc-mr1-dev am: fd97e7bc8c am: 5c96b0d1ab Change-Id: Idbb8416e0f3e20e57568a5e3d0f2cb7a202f7742