aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrevor Johns <trevorjohns@google.com>2016-05-18 05:35:46 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-18 05:35:46 +0000
commitbcc4aec8529bb9b05b342acc83beb090456d63b3 (patch)
tree763bbb96b335db455f6b13dfc0b448798cb3133c
parent462f3ed43cf0b5604fc32f4d2948ee63af32283f (diff)
parent169b8122dcd61e05c3495cbd1c59b6ca825decc6 (diff)
downloadandroid-bcc4aec8529bb9b05b342acc83beb090456d63b3.tar.gz
Update dependency versions am: 7c3c09dcf0 am: a9d2784f71 am: 490a735975
am: 169b8122dc * commit '169b8122dcd61e05c3495cbd1c59b6ca825decc6': Update dependency versions Change-Id: I5e46518a78e6fcd493318d4cef9940140d7e62d1
-rw-r--r--ui/views/NavigationDrawer/template-params.xml8
-rw-r--r--wearable/wear/AgendaData/template-params.xml2
-rw-r--r--wearable/wear/RuntimePermissionsWear/template-params.xml4
-rw-r--r--wearable/wear/SpeedTracker/template-params.xml2
-rw-r--r--wearable/wear/WatchFace/template-params.xml2
-rw-r--r--wearable/wear/WearDrawers/Wearable/build.gradle2
6 files changed, 10 insertions, 10 deletions
diff --git a/ui/views/NavigationDrawer/template-params.xml b/ui/views/NavigationDrawer/template-params.xml
index e85b0ddd..244eea19 100644
--- a/ui/views/NavigationDrawer/template-params.xml
+++ b/ui/views/NavigationDrawer/template-params.xml
@@ -29,10 +29,10 @@
<compileSdkVersion>23</compileSdkVersion>
- <dependency>com.android.support:support-v13:23.1.1</dependency>
- <dependency>com.android.support:appcompat-v7:23.1.1</dependency>
- <dependency>com.android.support:recyclerview-v7:23.1.1</dependency>
- <dependency>com.android.support:cardview-v7:23.1.1</dependency>
+ <dependency>com.android.support:support-v13:23.3.0</dependency>
+ <dependency>com.android.support:appcompat-v7:23.3.0</dependency>
+ <dependency>com.android.support:recyclerview-v7:23.3.0</dependency>
+ <dependency>com.android.support:cardview-v7:23.3.0</dependency>
<strings>
<intro>
diff --git a/wearable/wear/AgendaData/template-params.xml b/wearable/wear/AgendaData/template-params.xml
index a6082e41..5b222503 100644
--- a/wearable/wear/AgendaData/template-params.xml
+++ b/wearable/wear/AgendaData/template-params.xml
@@ -26,7 +26,7 @@
<targetSdkVersion>23</targetSdkVersion>
<targetSdkVersionWear>23</targetSdkVersionWear>
- <dependency>com.android.support:design:23.1.1</dependency>
+ <dependency>com.android.support:design:23.3.0</dependency>
<wearable>
<has_handheld_app>true</has_handheld_app>
diff --git a/wearable/wear/RuntimePermissionsWear/template-params.xml b/wearable/wear/RuntimePermissionsWear/template-params.xml
index 9c2d4f6b..0f6888a5 100644
--- a/wearable/wear/RuntimePermissionsWear/template-params.xml
+++ b/wearable/wear/RuntimePermissionsWear/template-params.xml
@@ -28,8 +28,8 @@
<has_handheld_app>true</has_handheld_app>
</wearable>
- <dependency>com.android.support:appcompat-v7:23.1.1</dependency>
- <dependency>com.android.support:design:23.1.1</dependency>
+ <dependency>com.android.support:appcompat-v7:23.3.0</dependency>
+ <dependency>com.android.support:design:23.3.0</dependency>
<provided_dependency_wearable>com.google.android.wearable:wearable:1.0.0</provided_dependency_wearable>
<strings>
diff --git a/wearable/wear/SpeedTracker/template-params.xml b/wearable/wear/SpeedTracker/template-params.xml
index 982e1b09..e086142a 100644
--- a/wearable/wear/SpeedTracker/template-params.xml
+++ b/wearable/wear/SpeedTracker/template-params.xml
@@ -30,7 +30,7 @@
<has_handheld_app>true</has_handheld_app>
</wearable>
- <dependency>com.android.support:design:23.1.1</dependency>
+ <dependency>com.android.support:design:23.3.0</dependency>
<dependency>com.google.android.gms:play-services-location</dependency>
<dependency_wearable>com.google.android.gms:play-services-location</dependency_wearable>
diff --git a/wearable/wear/WatchFace/template-params.xml b/wearable/wear/WatchFace/template-params.xml
index f4aa1059..a3d9d8a6 100644
--- a/wearable/wear/WatchFace/template-params.xml
+++ b/wearable/wear/WatchFace/template-params.xml
@@ -27,7 +27,7 @@
<targetSdkVersionWear>23</targetSdkVersionWear>
<dependency_wearable>com.google.android.gms:play-services-wearable</dependency_wearable>
- <dependency_wearable>com.android.support:palette-v7:23.1.1</dependency_wearable>
+ <dependency_wearable>com.android.support:palette-v7:23.3.0</dependency_wearable>
<dependency>com.google.android.support:wearable:1.4.0</dependency>
<dependency_wearable>com.google.android.support:wearable:2.0.0-alpha1</dependency_wearable>
diff --git a/wearable/wear/WearDrawers/Wearable/build.gradle b/wearable/wear/WearDrawers/Wearable/build.gradle
index 70841eed..712b9aee 100644
--- a/wearable/wear/WearDrawers/Wearable/build.gradle
+++ b/wearable/wear/WearDrawers/Wearable/build.gradle
@@ -20,7 +20,7 @@ dependencies {
provided "com.google.android.wearable:wearable:1.0.0"
compile 'com.google.android.gms:play-services-wearable:8.4.0'
- compile 'com.android.support:support-v13:23.1.1'
+ compile 'com.android.support:support-v13:23.3.0'
compile 'com.google.android.support:wearable:1.4.0'
}