| commit | 9e0357b96bd5c84e39c3084625d58b21f9bad74c | [log] [tgz] |
|---|---|---|
| author | Hung-ying Tyan <tyanh@google.com> | Wed Jan 19 22:43:13 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 19 22:43:13 2011 -0800 |
| tree | d295b675dc94b0a92f07ac74bfaf85eda4c4af8c | |
| parent | 9376f272516e9b4376c763086d7471d1cbee23e7 [diff] | |
| parent | 71196f0cb3406cc4b0b82643ca08b59a97bc4cc8 [diff] |
am 71196f0c: Merge "Make VpnService synchronous API." into honeycomb * commit '71196f0cb3406cc4b0b82643ca08b59a97bc4cc8': Make VpnService synchronous API.