OSDN Git Service

Merge "do not allow monkey to flip OEM unlock flag" into lmp-dev
authorGuang Zhu <guangzhu@google.com>
Fri, 12 Sep 2014 22:20:19 +0000 (22:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 12 Sep 2014 22:20:20 +0000 (22:20 +0000)

Trivial merge