tree 3fbf67cab2bb1e9054840941cb29b1d16b59a280
parent d5ec6ebee26e530d96299d9821950f7cce4b3636
parent 21bd4af88a24d0df020f68683f7c60698ebcc76a
author Hung-ying Tyan <tyanh@google.com> 1248670060 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1248670060 -0700

am 21bd4af8: Simplify the VPN service implementation.

Merge commit '21bd4af88a24d0df020f68683f7c60698ebcc76a'

* commit '21bd4af88a24d0df020f68683f7c60698ebcc76a':
  Simplify the VPN service implementation.