Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread
diff --git a/core/user_tags.mk b/core/user_tags.mk
index 1c6a56a..75001b7 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -32,6 +32,8 @@
 	aapt \
 	acp \
 	adb \
+	AdbWinApi \
+	AdbWinUsbApi \
 	adbd \
 	aidl \
 	am \
@@ -440,6 +442,7 @@
 	schedtest \
 	screenshot2 \
 	sdcard \
+	sdklauncher \
 	sdklib \
 	sdkmanager \
 	sdkstats \