commit | 10d2991a66e197fb87cbf31fb675b1bdf0ead948 | [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 | 43c783e665b9e1c47210d3c5a8f929b33acda72f | |
parent | 7b3be599ea477e4fd8f46d3d828e0c33c8276f50 [diff] | |
parent | e04592808637e17d3ec7df5ab2aafc53631d5ac6 [diff] |
am 7b98b666: Merge change 20738 into donut Merge commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7' * commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7': Fix a bug in getSocketError() in VpnService.