summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Scott Main <smain@google.com> 2011-10-14 14:31:09 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-10-14 14:31:09 -0700
commit8009752da64f5c6ec4df4f1737032bba74ebb2a4 (patch)
treed729ff06bb30244ec13b4fe2685b328751408784
parent686420a40e2bfd7c701cba9748d4771315dcd1cc (diff)
parent3087b94f7beafda54d3871e354dcde951b0c52a0 (diff)
Merge "fix android beam demo path" into ics-mr0
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 32dee5f4dca3..f41130b3066b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -403,7 +403,7 @@ web_docs_sample_code_flags := \
-samplecode $(sample_dir)/ActionBarCompat \
resources/samples/ActionBarCompat "Action Bar Compatibility" \
-samplecode $(sample_dir)/AndroidBeamDemo \
- resources/samples/AndroidBeam "Android Beam Demo" \
+ resources/samples/AndroidBeamDemo "Android Beam Demo" \
-samplecode $(sample_dir)/ApiDemos \
resources/samples/ApiDemos "API Demos" \
-samplecode $(sample_dir)/Support4Demos \