summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-05-10 09:43:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-10 09:43:03 -0700
commitaff856d053ba239114e7f16d3cdd240a6d973f2f (patch)
tree95dfbbad36cad13bb1c76e138d13065c33306399 /Android.mk
parente34d31e690cdfc529fe8e1e8f70e50c3719a4ccc (diff)
parent0dd3a239519369933d4efa701479c816b4b33874 (diff)
downloadframeworks_base-aff856d053ba239114e7f16d3cdd240a6d973f2f.zip
frameworks_base-aff856d053ba239114e7f16d3cdd240a6d973f2f.tar.gz
frameworks_base-aff856d053ba239114e7f16d3cdd240a6d973f2f.tar.bz2
am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
Merge commit '0dd3a239519369933d4efa701479c816b4b33874' into froyo-plus-aosp * commit '0dd3a239519369933d4efa701479c816b4b33874': Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 8f968d8..712d7d3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -411,6 +411,10 @@ web_docs_sample_code_flags := \
resources/samples/Snake "Snake" \
-samplecode $(sample_dir)/SoftKeyboard \
resources/samples/SoftKeyboard "Soft Keyboard" \
+ -samplecode $(sample_dir)/Spinner \
+ resources/samples/Spinner "Spinner" \
+ -samplecode $(sample_dir)/SpinnerTest \
+ resources/samples/SpinnerTest "SpinnerTest" \
-samplecode $(sample_dir)/Wiktionary \
resources/samples/Wiktionary "Wiktionary" \
-samplecode $(sample_dir)/WiktionarySimple \