OSDN Git Service

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

* commit '11dcefc9a87f349d1554645f23bad6d065e5ce2a':
  handle devices that don't support FLASH_LOCK_STATE

Change-Id: Ic3e8ab682e2875bbf79c83878d931e305369606f


Trivial merge