Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a386dbd authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge Android 10 into master 

Bug: 139893257
Change-Id: If513af9584f5d1569a1d3357dc4ee9fe44a61f69
parents ba69fc1e 23deefd9

apex/AndroidManifest.xml

+1 −2
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ 
    * can work with any version of netd.

    * can work with any version of netd.

    -->

    -->

  <uses-sdk

  <uses-sdk

      android:minSdkVersion="28"

      android:targetSdkVersion="29"

      android:targetSdkVersion="28"

  />

  />

</manifest>
 
</manifest>

apex/manifest.json

+1 −1
Original line number Original line Diff line number Diff line 
{

{

  "name": "com.android.resolv",

  "name": "com.android.resolv",

  "version": 1

  "version": 290000000

}
 
}