| commit | 6c8163c640114ddb62dc1e6b77fd4248d67f6fff | [log] [tgz] |
|---|---|---|
| author | Chia-chi Yeh <chiachi@android.com> | Fri Dec 02 12:46:51 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 02 12:46:51 2011 -0800 |
| tree | 48623910fe75822605f4a4c5884e8b8bcd745d86 | |
| parent | 00dbb097dca9b29dc35cb52f11329c86c26fefb5 [diff] | |
| parent | f17b809ba0ea946604b24a4545058401d2bfca83 [diff] |
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 '431c3e4c7e2103865a90501a552b4e5145ed3f35': Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html