Merge branch 'develop' of https://github.com/wordpress-mobile/WordPre…

…ss-Android into feature/calypso-stats Conflicts: WordPress/src/main/AndroidManifest.xml WordPress/src/main/java/org/wordpress/android/ui/WPActionBarActivity.java WordPress/src/main/java/org/wordpress/android/ui/stats/StatsActivity.java WordPress/src/main/java/org/wordpress/android/ui/stats/StatsDetailsActivity.java
wordpress-mobile · Nov 24, 2014 · 69cf829 · 69cf829
2 parents d6b33d5 + 9c72e3f
commit 69cf829
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/WordPressGraphView/build.gradle b/WordPressGraphView/build.gradle
@@ -14,7 +14,7 @@ android {
     publishNonDefault true
 
     compileSdkVersion 19
-    buildToolsVersion "19.1.0"
+    buildToolsVersion "21.1.1"
 
     defaultConfig {
         versionName "3.2.2"