tree a120e95eba3c5c1aa89c6b0c0d1d2f9a2d81ec0e
parent ee1cdde4bcea1635a6af99c2ada1e155cf1b7a3b
parent ad5d6d329e9f3fbf571a7e770d29d5fc63d148c5
author Kenny Root <kroot@google.com> 1350026560 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350026560 -0700

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

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