| commit | cd4db913a8aa4b99cdb95930f84d3edbefd1f61f | [log] [tgz] |
|---|---|---|
| author | Chia-chi Yeh <chiachi@android.com> | Thu Dec 01 14:06:11 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 01 14:06:11 2011 -0800 |
| tree | 395c47f696d0eb7467177cff93ed09dacacba66a | |
| parent | ac0ad7e7eb52e2a7ecda0e5281e8a802411f9827 [diff] | |
| parent | 51cf4f22830e7b4e52278db0772692c6db5f327d [diff] |
am 51cf4f22: am 9e1fdc96: Merge "Android VPN sample for ICS SDK" into ics-mr0 * commit '51cf4f22830e7b4e52278db0772692c6db5f327d': Android VPN sample for ICS SDK