tree 9c834f296fdf8bb941e2f8da5b6dd53534276ebc
parent 4c1fc64a3ea6e553c7e12573c798e77b50686d8b
parent 8d923e758c49c9c4342d86454e38e1a9887e9813
author Android (Google) Code Review <android-gerrit@google.com> 1250010078 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1250010078 -0700

Merge change 20738 into donut

* changes:
  Fix a bug in getSocketError() in VpnService.