Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5714e607 authored Sep 13, 2020 by Bill Yi

Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE

Merged-In: Ic5e9d14519f1942a42613b83084c053cb8ca05db
Change-Id: I7f4ef62badfe8a7fc7145114636715410c6fadc8

parents 6a715cf9 3992b180

apex/manifest.json

+1 −1

Original line number	Original line	Diff line number	Diff line
	{		{
	"name": "com.android.media",		"name": "com.android.media",
	"version": 300000000		"version": 300900700
	}		}

apex/manifest_codec.json

+1 −4

Original line number	Original line	Diff line number	Diff line
	{		{
	"name": "com.android.media.swcodec",		"name": "com.android.media.swcodec",
	"version": 300000000,		"version": 300900700
	"requireNativeLibs": [
	":sphal"
	]
	}		}