tree 16d90906be45884fbf3b574a3d3b5fb9efad3224
parent 099d69999fa8623824e7cad8529edb8097465e03
parent c48b20f8f1d3e07e8a931b195669b0ab8895006c
author Esteban Talavera <etalavera@google.com> 1470941654 +0000
committer android-build-merger <android-build-merger@google.com> 1470941654 +0000

Do not toggle OEM unlock if bootloader unlocked
am: c48b20f8f1

Change-Id: Ic42a52cc9d71aa1192de0a052efb23a625673232