Merge branch 'update_to_buildtools_0.13.0' into use_buildtools_version_1_0_0

devisnik · devisnik · commit 39f2d30eaad0 · 2014-12-20T21:03:00.000+01:00
Conflicts:
	gradle/wrapper/gradle-wrapper.properties
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,2 @@
 include 'demo-assethelper', 'demo-sqliteprovider', 'demo-auto'
-include 'analyzer'
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`include 'demo-assethelper', 'demo-sqliteprovider', 'demo-auto'`
`2`		`-include 'analyzer'`
`3`	`2`