tree 56b98a9a266ff785bdf8b74d3c87c447f9c44103
parent 1c737c94e510da9fd1b2f39391d2797b603ebf55
parent 57b8b975538b6ac6bb3b914813835d653a9a4978
author Tony Mantler <nicoya@google.com> 1384552188 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384552188 -0800

am 57b8b975: am 3888a333: am c6ab9979: Merge "Make sure the client certificate is always installed" into jb-ub-mail-ur10

* commit '57b8b975538b6ac6bb3b914813835d653a9a4978':
  Make sure the client certificate is always installed