summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorRobert Ly <robertly@google.com>2011-05-04 13:20:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-04 13:20:11 -0700
commit427a51ab735e2075b2a783fcf073c9db56727104 (patch)
tree5f805d1d68fcbaa47d578f45545528424f228d51 /Android.mk
parent70b276a16264ab232403f2f44f137df129408c67 (diff)
parent232ea51c9c1af7a56e2315de863d65382c7c9a67 (diff)
downloadframeworks_base-427a51ab735e2075b2a783fcf073c9db56727104.zip
frameworks_base-427a51ab735e2075b2a783fcf073c9db56727104.tar.gz
frameworks_base-427a51ab735e2075b2a783fcf073c9db56727104.tar.bz2
am 232ea51c: am 7c8be3a7: am 762481f0: Merge "adding the usb apis to the resources browser" into honeycomb-mr1
* commit '232ea51c9c1af7a56e2315de863d65382c7c9a67': adding the usb apis to the resources browser
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 898d7e2..d462a3f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -422,6 +422,8 @@ web_docs_sample_code_flags := \
resources/samples/TicTacToeLib "TicTacToeLib" \
-samplecode $(sample_dir)/TicTacToeMain \
resources/samples/TicTacToeMain "TicTacToeMain" \
+ -samplecode $(sample_dir)/USB \
+ resources/samples/USB "USB" \
-samplecode $(sample_dir)/WeatherListWidget \
resources/samples/WeatherListWidget "Weather List Widget" \
-samplecode $(sample_dir)/Wiktionary \