From 17d3d93913930fa893c668969f1ccd5b4de746cd Mon Sep 17 00:00:00 2001
From: aurimas <aurimas@chromium.org>
Date: Tue, 21 Oct 2014 10:04:58 -0700
Subject: Update targetSdkVersion for Chromium applications.

Behavior changes described here:
http://developer.android.com/about/versions/android-5.0.html

BUG=424680

TBR=aa@chromium.org

Review URL: https://codereview.chromium.org/664163003

Cr-Commit-Position: refs/heads/master@{#300506}
---
 android_webview/javatests/AndroidManifest.xml  | 2 +-
 android_webview/test/shell/AndroidManifest.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'android_webview')

diff --git a/android_webview/javatests/AndroidManifest.xml b/android_webview/javatests/AndroidManifest.xml
index a681e25..8005cd1 100644
--- a/android_webview/javatests/AndroidManifest.xml
+++ b/android_webview/javatests/AndroidManifest.xml
@@ -11,7 +11,7 @@
         <uses-library android:name="android.test.runner" />
     </application>
     <!-- TODO(joth): Change minSdkVersion to 16 when crbug/161864 lands. -->
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
     <instrumentation android:name="android.test.InstrumentationTestRunner"
         android:targetPackage="org.chromium.android_webview.shell"
         android:label="Tests for org.chromium.android_webview"/>
diff --git a/android_webview/test/shell/AndroidManifest.xml b/android_webview/test/shell/AndroidManifest.xml
index 749efaa..6529f36 100644
--- a/android_webview/test/shell/AndroidManifest.xml
+++ b/android_webview/test/shell/AndroidManifest.xml
@@ -32,7 +32,7 @@
   </application>
 
   <!-- TODO(joth): Change minSdkVersion to 16 when crbug/161864 lands. -->
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" />
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
-- 
cgit v1.1