commit 1668adaa66e6fb27ea7af065a62472beec4987fb
author Raman Tenneti <rtenneti@google.com> Sun Dec 16 01:05:08 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Dec 16 01:05:08 2018 +0000
tree 64a6ab4eaded7ea4fac29d7b12885936bbbe75a7
parent f493100c37cc943b27fafc17cad27533fbb16cf6
parent a235604786cf4e7144e2860243a737f384cc2bec

Merge "AOSP/Email - Bumped the targetSdkVersion to 24 (maximum version) across Email and UnifiedEmail with minimal changes."

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b0bb881..721ba1b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -27,7 +27,7 @@
     <uses-permission android:name="android.permission.NFC" />
 
     <!-- This needs to be present when we are doing unbundled releases. -->
-    <uses-sdk android:targetSdkVersion="21" android:minSdkVersion="14" />
+    <uses-sdk android:targetSdkVersion="24" android:minSdkVersion="14" />
 
     <application
         android:icon="@mipmap/ic_launcher_mail"

tests/AndroidManifest.xml

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index cee0001..58a463c 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -18,7 +18,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.mail.emailtests">
 
-    <uses-sdk android:targetSdkVersion="21" android:minSdkVersion="14" />
+    <uses-sdk android:targetSdkVersion="24" android:minSdkVersion="14" />
 
     <!-- We add an application tag here just so that we can indicate that
          this package needs to link against the android.test library,