Merge "docs: New redirect rule for all /downloads/... paths, pointing to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to use a simple URL in our docs for downloads and allows us change the storage location of the download assets in the future (such as when we're on devsite)." into jb-dev
diff --git a/build/sdk.atree b/build/sdk.atree
index 69a70aa..5727c06 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -71,6 +71,7 @@
# the uper-jar file that apps link against. This is the public API
${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android.jar platforms/${PLATFORM_NAME}/android.jar
+${OUT_DIR}/target/product/generic/system/framework/uiautomator.jar platforms/${PLATFORM_NAME}/uiautomator.jar
# the aidl precompiled include
obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl