diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-12-02 12:45:44 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-02 12:45:44 -0800 |
| commit | 431c3e4c7e2103865a90501a552b4e5145ed3f35 (patch) | |
| tree | 1512019ea82ea17219f86dd81eea9badf257da9f /docs/html/resources | |
| parent | cd0e446dc8de4b639df889ec3b5754bea60d752a (diff) | |
| parent | 8e076fe774386762da21d78823f905751f2803d9 (diff) | |
| download | frameworks_base-431c3e4c7e2103865a90501a552b4e5145ed3f35.zip frameworks_base-431c3e4c7e2103865a90501a552b4e5145ed3f35.tar.gz frameworks_base-431c3e4c7e2103865a90501a552b4e5145ed3f35.tar.bz2 | |
Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0
Diffstat (limited to 'docs/html/resources')
| -rw-r--r-- | docs/html/resources/resources-data.js | 10 | ||||
| -rwxr-xr-x | docs/html/resources/samples/images/vpn-confirmation.png | bin | 0 -> 60214 bytes |
2 files changed, 10 insertions, 0 deletions
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js index a35e684..18f1547 100644 --- a/docs/html/resources/resources-data.js +++ b/docs/html/resources/resources-data.js @@ -718,6 +718,16 @@ var ANDROID_RESOURCES = [ } }, { + tags: ['sample', 'communication', 'new'], + path: 'samples/ToyVpn/index.html', + title: { + en: 'Toy VPN Client' + }, + description: { + en: 'A sample application that illustrates the creation of a custom VPN client.' + } + }, + { tags: ['sample', 'newfeature'], path: 'samples/USB/index.html', title: { diff --git a/docs/html/resources/samples/images/vpn-confirmation.png b/docs/html/resources/samples/images/vpn-confirmation.png Binary files differnew file mode 100755 index 0000000..ae2e583 --- /dev/null +++ b/docs/html/resources/samples/images/vpn-confirmation.png |
