Commit fa54f948 authored Jan 16, 2020 by android-build-team Robot

Merge cherrypicks of [10101230, 10101593, 10101594, 10101595, 10101362,...

Merge cherrypicks of [10101230, 10101593, 10101594, 10101595, 10101362, 10101479, 10101363, 10101110, 10101480, 10102031, 10102032, 10101596, 10101364] into qt-qpr2-release

Change-Id: I6e8522b4cff11f568cb213e3967f484bbaafb0e0

parents f8e9ec66 bfd4592a

AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.networkstack"
		android:sharedUserId="android.uid.networkstack"
		android:versionCode="299900000"
		android:versionCode="290000000"
		android:versionName="2019-09"
		>