| commit | 7c2da311b723b2d75918d3b5867f66ed05e3cb6a | [log] [tgz] |
|---|---|---|
| author | Chia-chi Yeh <chiachi@android.com> | Fri Dec 02 17:57:14 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 02 17:57:14 2011 -0800 |
| tree | c13657903573c911c2ad799dc4fbcfdb1bad6565 | |
| parent | 7b2db8cd0b3f932ca2105c8347ea09415866650e [diff] | |
| parent | 5c33d1cadf31e8fccaa8657720b48157bcf53ec6 [diff] |
am 939a3dd4: 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 '939a3dd4e7e2282786a8c5270855b611317ad241': Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html