diff options
| author | Bill Yi <byi@google.com> | 2020-09-17 21:57:23 -0700 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2020-09-17 21:57:23 -0700 |
| commit | 088ff6336f64196721c3227c42d9588c56af8269 (patch) | |
| tree | aae40e28a9f5c2227af798a5750cd5764a022059 /AndroidManifest.xml | |
| parent | d1111745aa84126ed3084682edbb1db23c5aa1b2 (diff) | |
| parent | 32f51844e271295d5fcb386d1289b9a8b0217c9b (diff) | |
| download | platform_packages_modules_NetworkStack-088ff6336f64196721c3227c42d9588c56af8269.tar.gz platform_packages_modules_NetworkStack-088ff6336f64196721c3227c42d9588c56af8269.tar.bz2 platform_packages_modules_NetworkStack-088ff6336f64196721c3227c42d9588c56af8269.zip | |
Merge mainline-release 6664920 to master - DO NOT MERGE
Merged-In: I09503c3e461299afc4d58c69d235369857797d9b
Change-Id: Iec3c6d656851a8ed3e49a1b9d406754c90b7881c
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 82e70474..b61c89f3 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -19,8 +19,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.networkstack" android:sharedUserId="android.uid.networkstack" - android:versionCode="300000000" - android:versionName="2019-09" + android:versionCode="300900700" + android:versionName="r_aml_300900700" > <!-- Permissions must be defined here, and not in the base manifest, as the network stack running in the system server process does not need any permission, and having privileged |