tree 9a96adee96124f81755f6187cc9323cb9151c42a
parent 75c0928c59346e989ecb45ecade5681d8253ff46
parent 22726cf8174fe00a097c89b8da397b10626cdd00
author Chung-yih Wang <cywang@google.com> 1248212695 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1248212695 -0700

am 22726cf8: Return error codes for storing the key/cert in addPkcs12Keystore()

Merge commit '22726cf8174fe00a097c89b8da397b10626cdd00'

* commit '22726cf8174fe00a097c89b8da397b10626cdd00':
  Return error codes for storing the key/cert in addPkcs12Keystore()