From 288c8bca080d2fb5b9b090ddfc1fc8d67dcc2109 Mon Sep 17 00:00:00 2001 From: Pulser Date: Tue, 4 Nov 2014 20:04:51 +0000 Subject: [PATCH] Fix merge of android-5.0 manifest Change-Id: I25d733e480d332a98c4d28ee967a8f8be205525e --- default.xml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/default.xml b/default.xml index be0e2cf..ebd99ac 100644 --- a/default.xml +++ b/default.xml @@ -25,7 +25,6 @@ - @@ -182,7 +181,7 @@ - + @@ -193,7 +192,6 @@ -<<<<<<< HEAD @@ -272,7 +270,6 @@ -<<<<<<< HEAD @@ -321,7 +318,6 @@ - @@ -471,17 +467,6 @@ - - - - - - - - - - -