| commit | 77208f852c232033c5ae617ab93cf05a8af46b51 | [log] [tgz] |
|---|---|---|
| author | Hung-ying Tyan <tyanh@google.com> | Tue Aug 11 18:12:11 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 11 18:12:11 2009 -0700 |
| tree | 075adf5361bec3b2a0d527fdc1f6ff4e002f1deb | |
| parent | cff53466bb60bb346ab45be91c3fa578ce91f9d4 [diff] | |
| parent | 7b98b666ec465259c676c90cb12f3d1b4e1c7cf7 [diff] |
am 7b98b666: Merge change 20738 into donut Merge commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7' * commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7': Fix a bug in getSocketError() in VpnService.