OSDN Git Service

am ce90979d: Merge change 23480 into eclair
authorNagendra Modadugu <ngm@google.com>
Thu, 3 Sep 2009 18:14:53 +0000 (11:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Sep 2009 18:14:53 +0000 (11:14 -0700)
commit7fe782915199f03ec8e7484d2db35c9cb948770c
tree15371650bc2f33522fb2569f7d4c5de1c3b3d5f3
parentdf836c58934fd1f7ec4d7de57cd1c053399f89bb
parentce90979d06ae2e0832f3a11a7a4a0c0281de75df
am ce90979d: Merge change 23480 into eclair

Merge commit 'ce90979d06ae2e0832f3a11a7a4a0c0281de75df' into eclair-plus-aosp

* commit 'ce90979d06ae2e0832f3a11a7a4a0c0281de75df':
  Add Entrust root and intermediate certs.