Commit a66592bf 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: I0140f120d6df40e623aaf81b7314334691b62e28

parents b8d065aa a7e38f8c

apex/manifest.json

+1 −1

Original line number	Diff line number	Diff line
		{
		"name": "com.android.media",
		"version": 299900000
		"version": 290000000
		}

apex/manifest_codec.json

+1 −1

Original line number	Diff line number	Diff line
		{
		"name": "com.android.media.swcodec",
		"version": 299900000
		"version": 290000000
		}