Merge "adding Android Beam sample"

Author: scottamain

Android.mk

@@ -400,6 +400,8 @@ web_docs_sample_code_flags := \
 		            resources/samples/AccessibilityService "Accessibility Service" \
 		-samplecode $(sample_dir)/AccelerometerPlay \
 		            resources/samples/AccelerometerPlay "Accelerometer Play" \
+                -samplecode $(sample_dir)/AndroidBeam \
+		            resources/samples/AndroidBeam "Android Beam" \
 		-samplecode $(sample_dir)/ApiDemos \
 		            resources/samples/ApiDemos "API Demos" \
 		-samplecode $(sample_dir)/Support4Demos \

docs/html/resources/resources-data.js

@@ -407,6 +407,16 @@ var ANDROID_RESOURCES = [
       en: 'Illustrates an accessibility service that provides custom feedback for the Clock application which comes by default with Android devices'
     }
   },
+  {
+    tags: ['sample', 'new'],
+    path: 'samples/AndroidBeam/index.html',
+    title: {
+      en: 'Android Beam'
+    },
+    description: {
+      en: 'An example of how to use the Android Beam feature to send messages between two Android-powered devices (API level 14 or later) that support NFC.'
+    }
+  },
   {
     tags: ['sample', 'layout', 'ui'],
     path: 'samples/ApiDemos/index.html',