summaryrefslogtreecommitdiffstats
path: root/settings.gradle
diff options
context:
space:
mode:
authorChris Banes <chrisbanes@google.com>2015-04-09 07:15:54 +0000
committerChris Banes <chrisbanes@google.com>2015-04-09 07:15:54 +0000
commit292abcbbb9fe821027cc0832df5265312dc8c521 (patch)
tree41f9e2ac62a5da6633dad232c5a3a42cfdd4501c /settings.gradle
parent2517323bf840bbd37c616f212689060fbce30eab (diff)
downloadandroid_frameworks_support-292abcbbb9fe821027cc0832df5265312dc8c521.tar.gz
android_frameworks_support-292abcbbb9fe821027cc0832df5265312dc8c521.tar.bz2
android_frameworks_support-292abcbbb9fe821027cc0832df5265312dc8c521.zip
Revert "Disable the design lib for the 22.1 release DO NOT MERGE ANYWHERE"
This reverts commit 2517323bf840bbd37c616f212689060fbce30eab. Change-Id: I7cddc734ac5f86c786e425d0e7758dee6c80bae3
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 ff07e6790c..7e907c2c37 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -28,6 +28,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')