tree 02a86dc22485fd8ce11695a5684f670154c34610
parent 27be8cf10bb01d22b1ecbf4b491f3cd2bf8e0055
parent dcb2aa8b251ca4bdda095277662954a387a07afb
author Chia-chi Yeh <chiachi@android.com> 1308276237 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1308276237 -0700

Merge "VPN: make the file descriptor non-blocking by default."