diff options
| author | Trevor Johns <trevorjohns@google.com> | 2016-05-17 22:31:03 -0700 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2016-05-17 22:31:03 -0700 |
| commit | f00c67076b3f5b165a12eba23a1bf392262d93f3 (patch) | |
| tree | 48c7a3571530618d20bd6f344f2e1dbcc2b6600c /templates/base/_MODULE_/build.gradle.ftl | |
| parent | 2e106ef32944c88025c3b6536c2b56b0483557a0 (diff) | |
| parent | 46a3aa4d33f4069b789b919d26cf03c77313ce69 (diff) | |
| download | build-f00c67076b3f5b165a12eba23a1bf392262d93f3.tar.gz | |
Resolve merge conflicts of 46a3aa4 to nyc-dev
Change-Id: Ideb694b39fdb45eb77754103fc61fc6203f1f243
Diffstat (limited to 'templates/base/_MODULE_/build.gradle.ftl')
| -rw-r--r-- | templates/base/_MODULE_/build.gradle.ftl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/base/_MODULE_/build.gradle.ftl b/templates/base/_MODULE_/build.gradle.ftl index ce515efb..6f52e217 100644 --- a/templates/base/_MODULE_/build.gradle.ftl +++ b/templates/base/_MODULE_/build.gradle.ftl @@ -19,7 +19,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.0.0' + classpath 'com.android.tools.build:gradle:2.1.0' } } |