commit 5289a29b88f436e6061c49e90fea8266437714ab
author Wenyi Wang <wenyiw@google.com> Mon Jun 27 12:42:54 2016 -0700
committer Wenyi Wang <wenyiw@google.com> Fri Jul 01 12:28:33 2016 -0700
tree 983237637a8c852edd84c1b48d9f97fb966739e5
parent 30cd1890fbd864cb4f066797705ea51e01e28d5f

Merge src-N/ and src-pre-N/ and target API 24 (1/3)

Bug 29725318
Bug 29328819
Bug 29536552

Change-Id: I21854806fbf5c9a6e0fff3d12702bfaa96e04b26

tests/AndroidManifest.xml

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index adc62dc..e82cea8 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -19,7 +19,7 @@
 
     <uses-sdk
         android:minSdkVersion="21"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="24" />
 
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />