commit 4c0601d72ee55017210cabb6a8151e121c8df433
author gitbuildkicker <android-build@google.com> Sun Dec 04 07:00:27 2016 -0800
committer gitbuildkicker <android-build@google.com> Sun Dec 04 07:00:27 2016 -0800
tree a4ad7ba6929689c48d63c4408df9c0bd1b8b2c0b
parent 41c474008aedd3491469c153a85d402bebb5d2ab
parent ec2b2ae81b550e12623be4c5a9e2394d555145a7

merge in studio-master-weekly history after reset to studio-master-dev

constraintlayout/build.gradle

diff --git a/constraintlayout/build.gradle b/constraintlayout/build.gradle
index 7b5cb9b..8a49df7 100644
--- a/constraintlayout/build.gradle
+++ b/constraintlayout/build.gradle
@@ -86,7 +86,7 @@
     source = 'src/main/java'
     classpath = files("${rootDir}/../../prebuilts/sdk/${latestSdkVersion}/android.jar")
     options.addStringOption "resourcesdir", "${rootDir}/constraintlayout/resources/"
-    options.addStringOption "resourcesoutdir", "reference/android/support/constraint/"
+    options.addStringOption "resourcesoutdir", "reference/android/support/constraint/resources/"
     options.addStringOption "federate Android", "http://developer.android.com"
     options.addStringOption "federationapi Android",
                 "${rootDir}/../../prebuilts/sdk/api/${latestSdkVersion}.txt"