OSDN Git Service

Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev automerge: ea4d9a9
authorAndres Morales <anmorales@google.com>
Wed, 5 Nov 2014 18:08:26 +0000 (18:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Nov 2014 18:08:26 +0000 (18:08 +0000)
commit7d3e182c18978c7da43194d9deb564e5724b06e2
tree6fedd920bf5a3e4033c914a8e55424fcc05fae86
parent1e4d6e64a43a1eb5de893a71178c64d240d01f9f
parenteb55ac90dd8034a64ac146c4f4829b1e8bab1d17
Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev automerge: ea4d9a9
automerge: eb55ac9

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