OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2737bc ae9d437)
am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into...
authorJohn Spurlock <jspurlock@google.com>
Wed, 17 Sep 2014 19:48:26 +0000 (19:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Sep 2014 19:48:26 +0000 (19:48 +0000)
* commit 'ae9d437b4ab8dc98c347e4218390a38900979faa':
  Settings: Ensure CryptKeeper dismisses secure keyguards.


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