DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: If513af9584f5d1569a1d3357dc4ee9fe44a61f69
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>
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
}