OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e4d6e6 eb55ac9)
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)
automerge: eb55ac9

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


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help