commit bb5cb823d0de33143a105eccb71224a48697daf9
author android-build-team Robot <android-build-team-robot@google.com> Wed Jul 29 04:05:55 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jul 29 04:05:55 2020 +0000
tree 50aeb25f0b3a95650aa764299f69f498116addd5
parent cccf2432c0a59ccfa36a3909d9111a1c0c69755c
parent 56eedff6434f2d77807d3d1fa41a9c4687fdb004

Merge cherrypicks of [12257241, 12257478, 12257643, 12257707, 12257297, 12257742, 12257668, 12257743, 12257513, 12257278, 12257279, 12257514, 12257644, 12257669, 12257670, 12257671] into rvc-release

Change-Id: I6da2157502c1c44f34ee675520a12ead11ecf275

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 281f5be..8c876bb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,7 +25,7 @@
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
     <uses-permission android:name="android.permission.MANAGE_FINGERPRINT" />
 
-    <uses-sdk android:targetSdkVersion="24" />
+    <uses-sdk android:targetSdkVersion="29" />
 
     <application
         android:label="@string/app_name_settings_intelligence"