OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1dfb94 b08ff30)
am b08ff302: am 1cd02cac: am c0e34db1: Merge change Ifad4a4c0 into eclair
authorHung-ying Tyan <tyanh@google.com>
Mon, 12 Oct 2009 19:31:33 +0000 (12:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2009 19:31:33 +0000 (12:31 -0700)
Merge commit 'b08ff302c987c58e58b3a26881fc4dac5f016185'

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


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help