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

Commit 33210ec1 authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "change android beam sample name" into ics-mr0

parents 1a59c7e3 49eb5196

Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -402,8 +402,8 @@ web_docs_sample_code_flags := \ 
		            resources/samples/AccelerometerPlay "Accelerometer Play" \

		-samplecode $(sample_dir)/ActionBarCompat \

		            resources/samples/ActionBarCompat "Action Bar Compatibility" \

                -samplecode $(sample_dir)/AndroidBeam \

		            resources/samples/AndroidBeam "Android Beam" \

                -samplecode $(sample_dir)/AndroidBeamDemo \

		            resources/samples/AndroidBeam "Android Beam Demo" \

		-samplecode $(sample_dir)/ApiDemos \

		            resources/samples/ApiDemos "API Demos" \

		-samplecode $(sample_dir)/Support4Demos \

docs/html/resources/resources-data.js

+2 −2
Original line number Diff line number Diff line
@@ -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.'