commit 7a386dbd1599dbb4dc086200462c8cd5eaf112ad
author Xin Li <delphij@google.com> Wed Sep 04 13:34:53 2019 -0700
committer Xin Li <delphij@google.com> Wed Sep 04 13:34:53 2019 -0700
tree b1401c0d9091ddbae1d33783b6d6220524bacbf2
parent ba69fc1e5349ef99301d82a10264328c70c46046
parent 23deefd9c0d56205849fe11776f0099a5f3228d6

DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: If513af9584f5d1569a1d3357dc4ee9fe44a61f69

apex/AndroidManifest.xml

diff --git a/apex/AndroidManifest.xml b/apex/AndroidManifest.xml
index 29b9342..9d6455c 100644
--- a/apex/AndroidManifest.xml
+++ b/apex/AndroidManifest.xml
@@ -23,7 +23,6 @@
     * can work with any version of netd.
     -->
   <uses-sdk
-      android:minSdkVersion="28"
-      android:targetSdkVersion="28"
+      android:targetSdkVersion="29"
   />
 </manifest>

apex/manifest.json

diff --git a/apex/manifest.json b/apex/manifest.json
index c770b0a..6739a4d 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.resolv",
-  "version": 1
+  "version": 290000000
 }