OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6206bd3 9e807d4)
am 9e807d4d: am 86416202: am c4a768c8: am 5a720bb9: Merge "AndroidKeyStore: add key...
authorKenny Root <kroot@google.com>
Tue, 5 Feb 2013 01:22:14 +0000 (17:22 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 Feb 2013 01:22:14 +0000 (17:22 -0800)
# Via Android Git Automerger (3) and others
* commit '9e807d4d159066fe5a81bbaafbc974d18aeca55f':
  AndroidKeyStore: add key wrapping test


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