Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 939a3dd4 authored by Chia-chi Yeh's avatar Chia-chi Yeh Committed by Android Git Automerger
Browse files

am 25bcbbb5: am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK.... 

am 25bcbbb5: 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 '25bcbbb5':
  Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
parents 54cf27d7 25bcbbb5

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -478,6 +478,8 @@ web_docs_sample_code_flags := \ 
		            resources/samples/TicTacToeLib "TicTacToeLib" \

		-samplecode $(sample_dir)/TicTacToeMain \

		            resources/samples/TicTacToeMain "TicTacToeMain" \

		-samplecode $(sample_dir)/ToyVpn \

		            resources/samples/ToyVpn "Toy VPN Client" \

		-samplecode $(sample_dir)/USB \

		            resources/samples/USB "USB" \

		-samplecode $(sample_dir)/WeatherListWidget \

docs/html/resources/resources-data.js

+10 −0
Original line number Diff line number Diff line
@@ -717,6 +717,16 @@ var ANDROID_RESOURCES = [ 
      en: 'Demonstrates how an application can make use of shared code and resources stored in an Android library project.'

    }

  },

  {

    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',

docs/html/resources/samples/images/vpn-confirmation.png

0 → 100755
+58.8 KiB
Loading image diff...