Merge Android 12
Bug: 202323961
Merged-In: I3a3a3d1eac33caf0dc0456c294a20da5b4c9951e
Change-Id: Ia327c49c23fcf9593c8afaffb23480d53783a7ae
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 92fa57f..9fa7b92 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,8 +20,8 @@
coreApp="true"
package="com.android.networkstack.permissionconfig"
android:sharedUserId="android.uid.networkstack"
- android:versionCode="300900700"
- android:versionName="r_aml_300900700"
+ android:versionCode="300000000"
+ android:versionName="2019-09"
>
<!--
This package only exists to define the below permissions, and enforce that they are only