OSDN Git Service

Merge "handle devices that don\'t support FLASH_LOCK_STATE" into nyc-dev
authorAndres Morales <anmorales@google.com>
Thu, 7 Apr 2016 00:09:13 +0000 (00:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Apr 2016 00:09:13 +0000 (00:09 +0000)
commit11dcefc9a87f349d1554645f23bad6d065e5ce2a
tree3a3db63eedd8a2fdef12efa20ee3592311723c49
parentf312bd68dadd6404c3cd86c614b6e08be7d25797
parent20064037a7e52584a69edbaeccd29c23630a4156
Merge "handle devices that don\'t support FLASH_LOCK_STATE" into nyc-dev
am: 2006403

* commit '20064037a7e52584a69edbaeccd29c23630a4156':
  handle devices that don't support FLASH_LOCK_STATE

Change-Id: Ib5857f6a49aa8f2e105900a6ec0bcb2bf4908067