tree 19b564a6fdd3b28d6f356b6562f53c5880f723f4
parent f3f6a9ca17b59f4305bf5a99f49b8ece7bf343e6
parent 5db429c3eb447595975a7466801318288eef7eda
author Kenny Root <kroot@google.com> 1350026296 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350026296 -0700

am 5db429c3: (-s ours) Merge "Fix non-BC EC private key usage DO NOT MERGE"

* commit '5db429c3eb447595975a7466801318288eef7eda':
  Fix non-BC EC private key usage DO NOT MERGE