OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c684aa f2f8460)
am f2f84601: am 516fab24: am 133c5f5e: Merge "AndroidKeyStore: fix tests"
authorKenny Root <kroot@google.com>
Tue, 5 Feb 2013 01:19:50 +0000 (17:19 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 Feb 2013 01:19:50 +0000 (17:19 -0800)
# Via Android Git Automerger (2) and others
* commit 'f2f84601922f890c12b63ceaea54ee33c0aca83b':
  AndroidKeyStore: fix tests


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