OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed9fd0d 7dfc354)
am 7dfc3540: am 0f01eb7f: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses...
authorJohn Spurlock <jspurlock@google.com>
Wed, 17 Sep 2014 20:01:36 +0000 (20:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Sep 2014 20:01:36 +0000 (20:01 +0000)
* commit '7dfc3540a33c0bf53227db86ce193dc8ef0f02f4':
  Settings: Ensure CryptKeeper dismisses secure keyguards.


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