commit 722da03997b8b90e606c6307ee9012b1b1a2f556
author Xin Li <delphij@google.com> Thu Aug 27 10:17:01 2020 -0700
committer Xin Li <delphij@google.com> Thu Aug 27 10:17:01 2020 -0700
tree f603834d4011081d47c34e6324a37ba48c780ebd
parent cc75b7ae3e39a6e4a510086c0859069545a54db4
parent ff226f87468f1bd5f449d2b1ad04c4412a82db1d

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

Bug: 166295507
Merged-In: I4300dcec5639fbeb8bfc5feddee5c2096baf954c
Change-Id: Ie10758964e24b04d7c12dbd0c61cc408ece3bad9

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c7cb50d..4b5ac58 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,9 +19,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.networkstack.permissionconfig"
     android:sharedUserId="android.uid.networkstack"
-    android:versionCode="299900000"
+    android:versionCode="300000000"
     android:versionName="2019-09"
->
+  >
     <!--
     This package only exists to define the below permissions, and enforce that they are only
     granted to apps sharing the same signature.