From d8afdb49ffaf727ff5d493854501d42c27faae28 Mon Sep 17 00:00:00 2001
From: Robert Ly <robertly@google.com>
Date: Tue, 4 Oct 2011 16:57:09 -0700
Subject: [PATCH] adding Android Beam sample

Change-Id: I30df24bc41fe61ebaab29f23a8df54f2c9599394
---
 Android.mk                            |  2 ++
 docs/html/resources/resources-data.js | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/Android.mk b/Android.mk
index be8c25b714a18..c8b2555487ca9 100644
--- a/Android.mk
+++ b/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 \
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index 6c5d882908d07..d7700eecd8dc6 100644
--- a/docs/html/resources/resources-data.js
+++ b/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',