commit | fd97e7bc8cac91d849bf40202870c2220fc04f7a | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Aug 11 18:45:25 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 11 18:45:26 2016 +0000 |
tree | 12ed38f2012dcede2f45f876cb56b2cb6473f32a | |
parent | f679329412fcb5ea4cdd68f8b7b93595797d1d40 [diff] | |
parent | c48b20f8f1d3e07e8a931b195669b0ab8895006c [diff] |
Merge "Do not toggle OEM unlock if bootloader unlocked" into nyc-mr1-dev