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