OSDN Git Service

am 0189c6ef: am dd783301: Merge "Add optional additional entropy to finish"
authorChad Brubaker <cbrubaker@google.com>
Fri, 29 May 2015 21:44:34 +0000 (21:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 May 2015 21:44:34 +0000 (21:44 +0000)
commit533d164ed0263c682b5868a0e0f021a95ec9a9fe
tree0c6056a7fca440f31485f57c9443b77a5cc26e05
parentbd613068a38f5ae953e348e308d46271c4a59cec
parent0189c6efed4f36db0661d827d998a49bc34ece12
am 0189c6ef: am dd783301: Merge "Add optional additional entropy to finish"

* commit '0189c6efed4f36db0661d827d998a49bc34ece12':
  Add optional additional entropy to finish
keystore/java/android/security/KeyStore.java