OSDN Git Service

am 1cd02cac: am c0e34db1: Merge change Ifad4a4c0 into eclair
authorHung-ying Tyan <tyanh@google.com>
Wed, 7 Oct 2009 18:52:17 +0000 (11:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Oct 2009 18:52:17 +0000 (11:52 -0700)
commitb08ff302c987c58e58b3a26881fc4dac5f016185
treef217f0fa9f5e58351e3081731e7864b31db4a24c
parent33aa0fadf8cb0a7e4a4f23af17b30959927f083e
parent1cd02caccd4aa5b70ae342de386a21255cf9bed7
am 1cd02cac: am c0e34db1: Merge change Ifad4a4c0 into eclair

Merge commit '1cd02caccd4aa5b70ae342de386a21255cf9bed7' into eclair-mr2-plus-aosp

* commit '1cd02caccd4aa5b70ae342de386a21255cf9bed7':
  Add L2tpIpsec case in VpnSettings.processSecrets()