tree 2c357274815d543581371aa52ea40f0763f4168a
parent f89fa8337466be97e40c3ae3cc37704e3f666b5e
parent 0b889cd66fdb739a8078fb50212501849e35eb1e
author Robin Lee <rgl@google.com> 1402325224 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402325224 +0000

am 0b889cd6: am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId"

* commit '0b889cd66fdb739a8078fb50212501849e35eb1e':
  Choose CA certificate storage according to userId