tree d15a0157bdda1931c436c8084776efeafc6b7498
parent 6a10330eb678b5c168d123093c668649fb0ec7fa
parent 935406709edb9aaf6538e23e88ecfdf77cccd8ba
author Hung-ying Tyan <tyanh@google.com> 1249288680 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1249288680 -0700

am 93540670: Issue an error when VPN connection is lost.

Merge commit '935406709edb9aaf6538e23e88ecfdf77cccd8ba'

* commit '935406709edb9aaf6538e23e88ecfdf77cccd8ba':
  Issue an error when VPN connection is lost.