| commit | 3ed8dcfc4273e07dda699ba35b42c5c7c0bd906f | [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 | a7f67aa872847a695fca5ec8ddd4eb2ba225c29a | |
| parent | d45f5711f32d1fca68085dca2b34f7f78be13245 [diff] | |
| parent | 9e0357b96bd5c84e39c3084625d58b21f9bad74c [diff] |
am 9e0357b9: am 71196f0c: Merge "Make VpnService synchronous API." into honeycomb * commit '9e0357b96bd5c84e39c3084625d58b21f9bad74c': Make VpnService synchronous API.