tree ff45a8bf5286596e2ccad1d0b236c7f1fc7cfd55
parent 474b0f2941430b97b4f24f16f7173e5249ccc8f2
parent c9c119e7338cab292385118229f884a88fead3a2
author Android (Google) Code Review <android-gerrit@google.com> 1247851243 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1247851243 -0700

Merge change 7511 into donut

* changes:
  Support addPkcs12Keystore function in CertTool library.