OSDN Git Service

am c0e34db1: Merge change Ifad4a4c0 into eclair
authorHung-ying Tyan <tyanh@google.com>
Wed, 7 Oct 2009 18:46:38 +0000 (11:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Oct 2009 18:46:38 +0000 (11:46 -0700)
commit1cd02caccd4aa5b70ae342de386a21255cf9bed7
tree572f381f598d7a821ea492c06afb14994b894620
parentcab9fe2d41eba522a485dcad2b8e91f789e48c57
parentc0e34db16864e25946b288cb165ad833b62d3b18
am c0e34db1: Merge change Ifad4a4c0 into eclair

Merge commit 'c0e34db16864e25946b288cb165ad833b62d3b18' into eclair-mr2

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