OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7b2db8c
5c33d1c
)
am 939a3dd4: am 25bcbbb5: am 431c3e4c: Merge "Documentation for the VPN sample for...
author
Chia-chi Yeh
<chiachi@android.com>
Sat, 3 Dec 2011 01:57:14 +0000
(17:57 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Sat, 3 Dec 2011 01:57:14 +0000
(17:57 -0800)
* commit '
939a3dd4e7e2282786a8c5270855b611317ad241
':
Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
Trivial merge