aboutsummaryrefslogtreecommitdiff
path: root/build.gradle
diff options
context:
space:
mode:
Diffstat (limited to 'build.gradle')
-rw-r--r--build.gradle3
1 files changed, 3 insertions, 0 deletions
diff --git a/build.gradle b/build.gradle
index e01c6d1a..43a68122 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,6 +47,7 @@ List<String> samples = [
"ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic",
"ui/views/SwipeRefreshLayout/SwipeRefreshListFragment",
"ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews",
+<<<<<<< HEAD
"media/MediaRouter",
"admin/BasicManagedProfile",
"media/Camera2Basic",
@@ -59,6 +60,8 @@ List<String> samples = [
"ui/views/FloatingActionButton/FloatingActionButtonBasic",
"ui/views/RevealEffect/RevealEffectBasic",
"background/JobScheduler",
+"wearable/wear/SynchronizedNotifications",
+"media/MediaRouter"
]
List<String> taskNames = [