Merge "Revert "[DO NOT MERGE]""
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0355ac1..b031ffb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,7 +20,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.launcher3">
-    <uses-sdk android:targetSdkVersion="30" android:minSdkVersion="26"/>
+    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"/>
     <!--
     Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.
     Refer comments around specific entries on how to extend individual components.
diff --git a/build.gradle b/build.gradle
index 9cbd9b9..534ca65 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@
 
     defaultConfig {
         minSdkVersion 25
-        targetSdkVersion 30
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"