tree bafd5c2c5ac7fc8149e540af4b7e564f1cc61115
parent 4e6754ff4371d73d88ce76e659466950bdce45bd
parent 46cdd4376775c3b84139f2e4d734ef8affbd605c
author Kenny Root <kroot@android.com> 1363120034 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363120034 -0700

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

* commit '46cdd4376775c3b84139f2e4d734ef8affbd605c':
  Switch TLS Channel ID API from ECPrivateKey to PrivateKey.