OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5618117 1cb6f9d)
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
authorRicky Wai <rickywai@google.com>
Thu, 26 May 2016 14:03:51 +0000 (14:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 May 2016 14:03:51 +0000 (14:03 +0000)
am: 1cb6f9d8a4

* commit '1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e':
  Add resetKeyStore() in LockSettingsService

Change-Id: I0125a334fac098183e68fa0b9cd24bda64a88fae


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help