Commits
Hung-ying Tyan authored and Android Git Automerger committed 77208f852c2M
am 7b98b666: Merge change 20738 into donut Merge commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7' * commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7': Fix a bug in getSocketError() in VpnService.
Showing diff tocff53466bb6