summaryrefslogtreecommitdiffstats
path: root/docs/html/resources
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-10-14 10:29:53 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-14 10:29:53 -0700
commit33210ec1f5c8364c4865c718f4d0de00e28b5774 (patch)
tree1ba919e8434128cc91baaffe13abf42f20e2c163 /docs/html/resources
parent1a59c7e3973cd2de23e45afde1a5e8fdd8a2d30f (diff)
parent49eb519696526fa066830bd4a2341b6a105ce5c8 (diff)
downloadframeworks_base-33210ec1f5c8364c4865c718f4d0de00e28b5774.zip
frameworks_base-33210ec1f5c8364c4865c718f4d0de00e28b5774.tar.gz
frameworks_base-33210ec1f5c8364c4865c718f4d0de00e28b5774.tar.bz2
Merge "change android beam sample name" into ics-mr0
Diffstat (limited to 'docs/html/resources')
-rw-r--r--docs/html/resources/resources-data.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index b15e847..ddbc022 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -419,9 +419,9 @@ var ANDROID_RESOURCES = [
},
{
tags: ['sample', 'new'],
- path: 'samples/AndroidBeam/index.html',
+ path: 'samples/AndroidBeamDemo/index.html',
title: {
- en: 'Android Beam'
+ en: 'Android Beam Demo'
},
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.'