| commit | 4116cd5901c816f1ad80b753ce68464ffeaece2c | [log] [tgz] |
|---|---|---|
| author | Hung-ying Tyan <tyanh@google.com> | Wed Jan 19 22:46:32 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 19 22:46:32 2011 -0800 |
| tree | 1f56725967f21a561197e842466b2a9f3c2371d9 | |
| parent | b3708c3de833077a843159cb5443496bdce3f279 [diff] | |
| parent | 4e723420e045045f4338ad5328d1519cacc956fa [diff] |
am 9e0357b9: am 71196f0c: Merge "Make VpnService synchronous API." into honeycomb * commit '9e0357b96bd5c84e39c3084625d58b21f9bad74c': Make VpnService synchronous API.