OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2fb4c37 56e75f3)
am 56e75f3c: am 645e78d8: Merge "Allow multiuser use of keystore" into jb-mr2-dev
authorKenny Root <kroot@google.com>
Mon, 8 Apr 2013 18:07:37 +0000 (11:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Apr 2013 18:07:37 +0000 (11:07 -0700)
* commit '56e75f3c170f859ecd05b43ca5e3a14ac7878cf7':
  Allow multiuser use of keystore


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