resolved conflicts for merge of 262c085 to mnc-ub-dev

Change-Id: I9973c3127d02eed3858565d9e5111a0b84f76e45
aosp-mirror · Aug 21, 2015 · 456eb61 · 456eb61
2 parents 0c2c2c6 + 262c085
commit 456eb61
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/recommendation/build.gradle b/recommendation/build.gradle
@@ -9,6 +9,10 @@ dependencies {
 android {
     compileSdkVersion 'current'
 
+    defaultConfig {
+        minSdkVersion 21
+    }
+
     sourceSets {
         main.manifest.srcFile 'AndroidManifest.xml'
         main.java.srcDirs = ['src']

diff --git a/settings.gradle b/settings.gradle
@@ -37,6 +37,9 @@ project(':support-v13').projectDir = new File(rootDir, 'v13')
 include ':support-leanback-v17'
 project(':support-leanback-v17').projectDir = new File(rootDir, 'v17/leanback')
 
+include ':support-recommendation'
+project(':support-recommendation').projectDir = new File(rootDir, 'recommendation')
+
 include ':support-design'
 project(':support-design').projectDir = new File(rootDir, 'design')