OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46c26bd 8641620)
am 86416202: am c4a768c8: am 5a720bb9: Merge "AndroidKeyStore: add key wrapping test"
authorKenny Root <kroot@google.com>
Tue, 5 Feb 2013 01:19:54 +0000 (17:19 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 Feb 2013 01:19:54 +0000 (17:19 -0800)
# Via Android Git Automerger (2) and others
* commit '864162026dace9de4d75836f2acacce277c93ada':
  AndroidKeyStore: add key wrapping test


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