tree 8052be9310d1e24ea58d416969496fe5a385de45
parent fba8fdc6c588873aa944d7aa79b2f12ade78566a
parent 15b085f8d06b2b579e0cf30f8a57f9d15d50f2b9
author Chia-chi Yeh <chiachi@android.com> 1336148358 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336148358 -0700

am 15b085f8: Merge "Fix issue that VPN connection fail when L2TP secret enable"

* commit '15b085f8d06b2b579e0cf30f8a57f9d15d50f2b9':
  Fix issue that VPN connection fail when L2TP secret enable