tree 744cc402a63d850d400d78f5e32863603b0999e2
parent a8ccfe8f3766da6a7f82b0ca7c147f06a9bc50c5
parent 0048f46694737c3e46ec3150db608c2cb19f26aa
author Kenny Root <kroot@android.com> 1363119936 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363119936 -0700

am 0048f466: Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey."

* commit '0048f46694737c3e46ec3150db608c2cb19f26aa':
  Switch TLS Channel ID API from ECPrivateKey to PrivateKey.