| commit | 939a3dd4e7e2282786a8c5270855b611317ad241 | [log] [tgz] |
|---|---|---|
| author | Chia-chi Yeh <chiachi@android.com> | Fri Dec 02 12:48:35 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 02 12:48:35 2011 -0800 |
| tree | ce587ad9e55cb61a0a418b88be766a0b0f60cbb2 | |
| parent | 54cf27d7bbe27b1096f5e060c540f07dac07f1d0 [diff] | |
| parent | 25bcbbb5971e2832c3020ee406b27d641d4ca05b [diff] |
am 25bcbbb5: am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0 * commit '25bcbbb5971e2832c3020ee406b27d641d4ca05b': Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html