tree 8cc6950cf1e77adf5d2ae8e174f7f0fa112bcd6e
parent 6952841d8bb45902e78153a0422589efbf71fd82
parent dd20fc483e31ff20b5da95d37b4106150cd7c6b0
author Kenny Root <kroot@google.com> 1361843453 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1361843453 +0000

am dd20fc48: Merge "Fix CertPath APIs"

* commit 'dd20fc483e31ff20b5da95d37b4106150cd7c6b0':
  Fix CertPath APIs