commit f7d67da908a31eaef2af69879a677314ca05ffa1
author Renato Mangini <mangini@google.com> Fri Sep 05 19:55:00 2014 -0700
committer Renato Mangini <mangini@google.com> Fri Sep 05 19:55:00 2014 -0700
tree a15b8ec133361c7941729b6f8c403aeaffd22f23
parent 3cc4c03ffa5c4743632c46954a6a70443171ab99
parent f1f417b4347aad9d817fbda3b133a06c81a00b94

Resolved conflicts for merge 'f1f417b4' to lmp-dev

- Renamed modules <sampleName>Sample to Application
- fixed cached buildSrc using old SampleGenPlugin

Conflicts:
	build.gradle

Change-Id: Id7f98518188837ba6da11043314fbc5dffdbb59a

build.gradle

diff --git a/build.gradle b/build.gradle
index e01c6d1..dfc8cc7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,6 +59,7 @@
 "ui/views/FloatingActionButton/FloatingActionButtonBasic",
 "ui/views/RevealEffect/RevealEffectBasic",
 "background/JobScheduler",
+"wearable/wear/SynchronizedNotifications"
 ]
 
 List<String> taskNames = [