Merge "Don't copy the whole SdkController into the SDK."
diff --git a/build/tools.atree b/build/tools.atree
index 03868e2..8fc262c 100644
--- a/build/tools.atree
+++ b/build/tools.atree
@@ -146,7 +146,9 @@
prebuilts/tools/common/proguard/proguard4.7/src/proguard/ant/task.properties tools/proguard/ant/task.properties
# SDK Controller
-sdk/apps/SdkController tools/apps/SdkController
+#sdk/apps/SdkController tools/apps/SdkController
+sdk/apps/SdkController/SdkControllerLib tools/apps/SdkController/SdkControllerLib
+sdk/apps/SdkController/SdkControllerSensor tools/apps/SdkController/SdkControllerSensor
# tools specific support jar
framework/annotations.jar tools/support/annotations.jar