diff options
| author | Trevor Johns <trevorjohns@google.com> | 2014-09-16 11:34:04 -0700 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2014-09-16 11:34:04 -0700 |
| commit | 8a1b5d563135f1f93ebcce9249fc4e075548b94a (patch) | |
| tree | ebb728ae7df3544b8b95bca5469441d3a8ed0bf1 /build.gradle | |
| parent | 3ac410ecf1d01f0d1282e86e7c43a493b4d515d2 (diff) | |
| parent | 1b6f4fd1a5ad27cda048471e5c4cd4cb163a327f (diff) | |
| download | android-8a1b5d563135f1f93ebcce9249fc4e075548b94a.tar.gz | |
Merge branch 'klp-modular-docs' into lmp-preview-dev
Conflicts:
background/alarms/RepeatingAlarm/RepeatingAlarmSample/build.gradle
build.gradle
ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/build.gradle
wearable/wear/SynchronizedNotifications/Wearable/build.gradle
Change-Id: I2f57ada905c188dd8692c69a64a3385b6579d168
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 3 |
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 = [ |