OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68999a7 84c64ef)
am 84c64efe: am 403ac2d6: Merge "AndroidKeyStore keys should not be handled by Bouncy...
authorAlex Klyubin <klyubin@google.com>
Thu, 30 Apr 2015 16:39:11 +0000 (16:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Apr 2015 16:39:11 +0000 (16:39 +0000)
* commit '84c64efef90818888dca12f7650a632b70438a8f':
  AndroidKeyStore keys should not be handled by Bouncy Castle.


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