tree 400925e1d7eb3d04e795edeb4e0cbacdb48357ce
parent 769d6039e426a52666773d125045c2b035516159
parent 91115fd698c492c276307008ae533c22ebc46994
author Chia-chi Yeh <chiachi@android.com> 1253637225 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253637225 -0700

am 91115fd6: am 5b4aa6db: Merge change 26315 into eclair

Merge commit '91115fd698c492c276307008ae533c22ebc46994'

* commit '91115fd698c492c276307008ae533c22ebc46994':
  VpnService: use Credentials instead of CertTool.