Merge "Docs changes for WiFiDirect sample"

Android.mk

@@ -464,6 +464,8 @@ web_docs_sample_code_flags := \
 		            resources/samples/USB "USB" \
 		-samplecode $(sample_dir)/WeatherListWidget \
 		            resources/samples/WeatherListWidget "Weather List Widget" \
+		-samplecode $(sample_dir)/WiFiDirectDemo \
+                            resources/samples/WiFiDirectDemo "Wi-Fi Direct Demo" \
 		-samplecode $(sample_dir)/Wiktionary \
 		            resources/samples/Wiktionary "Wiktionary" \
 		-samplecode $(sample_dir)/WiktionarySimple \

docs/html/resources/resources-data.js

@@ -727,6 +727,16 @@ var ANDROID_RESOURCES = [
       en: 'A sample application to demonstrate how to use voicemail content provider APIs in Android 4.0.'
     }
   },
+  {
+    tags: ['sample','newfeature', 'new'],
+    path: 'samples/WiFiDirectDemo/index.html',
+    title: {
+      en: 'Wi-Fi Direct Demo'
+    },
+    description: {
+      en: 'A demo application to demonstrate how to use Wi-Fi Direct APIs.'
+    }
+  },
   {
     tags: ['sample', 'ui', 'widgets'],
     path: 'samples/Wiktionary/index.html',