tree 075adf5361bec3b2a0d527fdc1f6ff4e002f1deb
parent cff53466bb60bb346ab45be91c3fa578ce91f9d4
parent 7b98b666ec465259c676c90cb12f3d1b4e1c7cf7
author Hung-ying Tyan <tyanh@google.com> 1250039531 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1250039531 -0700

am 7b98b666: Merge change 20738 into donut

Merge commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7'

* commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7':
  Fix a bug in getSocketError() in VpnService.