tree fddbe643b5953a809e566bfe724b17f9dd92c0f2
parent fb3cd6c869a665ecf50fdb7d3eb29f2766bc710f
parent 112d0abb0d9ea5e55d373b4622d63657581e866b
author Guang Zhu <guangzhu@google.com> 1410561095 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410561095 +0000

am 336a9316: Merge "do not allow monkey to flip OEM unlock flag" into lmp-dev

* commit '336a93165a5e3383b6cf2479222cc18ae85aedaf':
  do not allow monkey to flip OEM unlock flag