diff options
| author | Jose Lima <joselima@google.com> | 2015-08-20 19:45:37 -0700 |
|---|---|---|
| committer | Jose Lima <joselima@google.com> | 2015-08-20 19:45:37 -0700 |
| commit | 456eb61cc3fd3a250636fbcea6b73a973c77ad5c (patch) | |
| tree | 0448fa02ac2e5c141946f4580171f2bcb1f69113 /settings.gradle | |
| parent | 0c2c2c650e4f80c7cc15bc4b47a318def6f73840 (diff) | |
| parent | 262c08577a6a7a46f1a18cc849e850728b7d796a (diff) | |
| download | android_frameworks_support-456eb61cc3fd3a250636fbcea6b73a973c77ad5c.tar.gz android_frameworks_support-456eb61cc3fd3a250636fbcea6b73a973c77ad5c.tar.bz2 android_frameworks_support-456eb61cc3fd3a250636fbcea6b73a973c77ad5c.zip | |
resolved conflicts for merge of 262c0857 to mnc-ub-dev
Change-Id: I9973c3127d02eed3858565d9e5111a0b84f76e45
Diffstat (limited to 'settings.gradle')
| -rw-r--r-- | settings.gradle | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/settings.gradle b/settings.gradle index c5a70f32f7..d33c2ac1ae 100644 --- 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') |