diff options
| author | Trevor Johns <trevorjohns@google.com> | 2016-05-17 22:32:37 -0700 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2016-05-17 22:32:37 -0700 |
| commit | 462f3ed43cf0b5604fc32f4d2948ee63af32283f (patch) | |
| tree | 7d436c32b1002e04092e581023a76cfbfb54c78f /ui | |
| parent | d13f63baff77d16f30d3f32d1ca7a000f5aa215d (diff) | |
| parent | 9df2f3974bccd836d67980ff611ca516eb691748 (diff) | |
| download | android-462f3ed43cf0b5604fc32f4d2948ee63af32283f.tar.gz | |
Resolve merge conflicts of 9df2f39 to nyc-dev
Change-Id: Ie7078d3e33ed06c3744d8d0df070af5ee5b587a4
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/actionbarcompat/ActionBarCompat-SearchView/build.gradle | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/actionbarcompat/ActionBarCompat-SearchView/build.gradle b/ui/actionbarcompat/ActionBarCompat-SearchView/build.gradle index 188b7c61..c23f3660 100644 --- a/ui/actionbarcompat/ActionBarCompat-SearchView/build.gradle +++ b/ui/actionbarcompat/ActionBarCompat-SearchView/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.0.0' + classpath 'com.android.tools.build:gradle:2.1.0' } } |