commit 859423fd028f9b27f08e6fa4fb0cf342df196863
author The Android Automerger <android-build@google.com> Sun Jun 05 00:04:56 2016 -0700
committer The Android Automerger <android-build@google.com> Sun Jun 05 00:04:56 2016 -0700
tree 62fdaa1fa7cb97270e5044caf4bcdc9801ad1254
parent f1210c127a4288aa53ec8dd3936a0077c63022eb
parent 0d8b59d65f18c59cec6e79b3d9576d12d71c93ac

merge in nyc-release history after reset to nyc-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8fe8fae..5ab5910 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="com.android.messaging"
     android:installLocation="internalOnly">
 
-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="24" />
 
     <!-- Application holds CPU wakelock while working in background -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />