summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorBruno Oliveira <btco@google.com>2011-06-21 11:11:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-21 11:11:18 -0700
commitf1c71771a2164ed0009ef9b22f9c03bd3b1af3f9 (patch)
treeb6afb67acea6c64dddcffb4a43df9a616796c32f /Android.mk
parenta6632992135cf25b273abf7f239d7d378c936007 (diff)
parentda61eab862dabe00f95c784a01c019e4f7776b23 (diff)
downloadframeworks_base-f1c71771a2164ed0009ef9b22f9c03bd3b1af3f9.zip
frameworks_base-f1c71771a2164ed0009ef9b22f9c03bd3b1af3f9.tar.gz
frameworks_base-f1c71771a2164ed0009ef9b22f9c03bd3b1af3f9.tar.bz2
am da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2
* commit 'da61eab862dabe00f95c784a01c019e4f7776b23': Integrating RandomMusicPlayer sample into tree.
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 32e6e7b..810c060 100644
--- a/Android.mk
+++ b/Android.mk
@@ -423,6 +423,8 @@ web_docs_sample_code_flags := \
resources/samples/NotePad "Note Pad" \
-samplecode $(sample_dir)/SampleSyncAdapter \
resources/samples/SampleSyncAdapter "Sample Sync Adapter" \
+ -samplecode $(sample_dir)/RandomMusicPlayer \
+ resources/samples/RandomMusicPlayer "Random Music Player" \
-samplecode $(sample_dir)/RenderScript \
resources/samples/RenderScript "RenderScript" \
-samplecode $(sample_dir)/SearchableDictionary \