From 73a511fdf5173785e98bfba5b253e7d93964cd85 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <alex@mapswithme.com>
Date: Sat, 28 Jun 2014 19:51:21 -1000
Subject: [PATCH] [android] Android Studio 0.8.1 and new Gradle support

---
 android/build.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/android/build.gradle b/android/build.gradle
index 96e2b149e4..a6feb7bf23 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.11.1'
+    classpath 'com.android.tools.build:gradle:0.12.0'
   }
 }
 
@@ -28,6 +28,8 @@ android {
   compileSdkVersion propTargetSdkVersion.toInteger()
   buildToolsVersion propBuildToolsVersion
 
+  useOldManifestMerger true
+
   defaultConfig {
     // Default package name is taken from the manifest and should be com.mapswithme.maps
     versionCode propVersionCode.toInteger()