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