commit c88240ab60898b57a0ba342470c4ced2986f3b5f
author Trevor Johns <trevorjohns@google.com> Tue Sep 16 19:32:57 2014 -0700
committer Trevor Johns <trevorjohns@google.com> Tue Sep 16 21:29:44 2014 -0700
tree 1e76296a3846307fb5b727a5850c513d2c5e7c54
parent 2eb5994a0627ab9397d7cb5594bf10dfdb0d99f1

Update build.gradle with new projects

- RecyclerView
- CardView
- LNotifications
- DrawableTinting
- Interpolator

Change-Id: Iaa9ae3f6128b38776784464654b3a03cd566d99d

build.gradle

diff --git a/build.gradle b/build.gradle
index 43a6812..34fd249 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,7 +47,6 @@
 "ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic",
 "ui/views/SwipeRefreshLayout/SwipeRefreshListFragment",
 "ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews",
-<<<<<<< HEAD
 "media/MediaRouter",
 "admin/BasicManagedProfile",
 "media/Camera2Basic",
@@ -61,7 +60,11 @@
 "ui/views/RevealEffect/RevealEffectBasic",
 "background/JobScheduler",
 "wearable/wear/SynchronizedNotifications",
-"media/MediaRouter"
+"ui/views/RecyclerView",
+"ui/views/CardView",
+"ui/notifications/LNotifications",
+"ui/DrawableTinting",
+"ui/Interpolator",
 ]
 
 List<String> taskNames = [