summaryrefslogtreecommitdiffstats
path: root/settings.gradle
diff options
context:
space:
mode:
authorChris Banes <chrisbanes@google.com>2015-04-08 14:46:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-08 14:46:08 +0000
commitce00c06a528480f81f06931e361102d3f879d40f (patch)
tree50de0e9fbc7088d18fcbdd7464497051e743e6f7 /settings.gradle
parent0053075bc4a6cc03e8a05bd8cb74f3b9d5922ae0 (diff)
parent6eb7c159042d9ad2b3150d0af9b3584c961dcca9 (diff)
downloadandroid_frameworks_support-ce00c06a528480f81f06931e361102d3f879d40f.tar.gz
android_frameworks_support-ce00c06a528480f81f06931e361102d3f879d40f.tar.bz2
android_frameworks_support-ce00c06a528480f81f06931e361102d3f879d40f.zip
am 6eb7c159: Revert "Disable the design lib for the 22.1 release"
* commit '6eb7c159042d9ad2b3150d0af9b3584c961dcca9': Revert "Disable the design lib for the 22.1 release"
Diffstat (limited to 'settings.gradle')
-rw-r--r--settings.gradle5
1 files changed, 2 insertions, 3 deletions
diff --git a/settings.gradle b/settings.gradle
index cefc4205dd..c4fdee25f0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -37,6 +37,5 @@ project(':support-v13').projectDir = new File(rootDir, 'v13')
include ':support-leanback-v17'
project(':support-leanback-v17').projectDir = new File(rootDir, 'v17/leanback')
-// Disabled for the 22.1.0 release
-// include ':support-design'
-// project(':support-design').projectDir = new File(rootDir, 'design')
+include ':support-design'
+project(':support-design').projectDir = new File(rootDir, 'design')