commit 1c132b613d14e12f543bd22d1b3061fba6e9efe9
author Ken Wakasa <kwakasa@google.com> Tue Sep 16 12:04:54 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 16 12:04:54 2014 +0000
tree 8b734e76815786104ea4390f0f2af0387e6b40c5
parent 720e1c66c5d761cbb69b09d4560d0009d2b02c3c
parent c0617f3ed50f902fbd8953c4e7545cad34f057d9

am c0617f3e: Merge "Prepare for E MR1 that is linked against L SDK"

* commit 'c0617f3ed50f902fbd8953c4e7545cad34f057d9':
  Prepare for E MR1 that is linked against L SDK

java/AndroidManifest.xml

diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index a1ffe5a..054c415 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -18,7 +18,7 @@
         coreApp="true"
         package="com.android.inputmethod.latin">
 
-    <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.DOWNLOAD_WITHOUT_NOTIFICATION" />

tests/AndroidManifest.xml

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 4ca846b..8a628cd 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.inputmethod.latin.tests">
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.READ_CONTACTS" />