OSDN Git Service

Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev
authorAndres Morales <anmorales@google.com>
Wed, 5 Nov 2014 17:38:35 +0000 (17:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Nov 2014 17:38:35 +0000 (17:38 +0000)
commiteb55ac90dd8034a64ac146c4f4829b1e8bab1d17
treea01af85bbf16046b750327584658320aaa39e636
parent966a1cadbf83412384261d1eea1192150e5fd1a8
parentea4d9a9eca7e18d35e521d80d57628f5a7347e55
Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev
automerge: ea4d9a9

* commit 'ea4d9a9eca7e18d35e521d80d57628f5a7347e55':
  Confirm enabling OEM unlock with warning dialog
  Request PIN confirmation to enable OEM unlock