| commit | e8120652733ed1ee9cdb6fe1b34aadd04824c3f1 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Sep 17 21:58:07 2020 -0700 |
| committer | Bill Yi <byi@google.com> | Fri Sep 18 13:12:08 2020 +0000 |
| tree | cf9b95738713004b748db3749c5b42ba528b55d2 | |
| parent | 85cb71d0f16a59bb51caaa437567e9e6e58e117c [diff] | |
| parent | 3992b18083c6adbc38cccfea9fd260b98f2c1bc1 [diff] |
Merge mainline-release 6664920 to master - DO NOT MERGE Merged-In: I96e67a481b839c9de4a5fea0d7a540b93441133c Change-Id: Ib14c021af983aad687b357c6f0a9b843cf37d6c2
diff --git a/apex/manifest.json b/apex/manifest.json index ddd642e..4254bdf 100644 --- a/apex/manifest.json +++ b/apex/manifest.json
@@ -1,4 +1,4 @@ { "name": "com.android.media", - "version": 300000000 + "version": 300900700 }
diff --git a/apex/manifest_codec.json b/apex/manifest_codec.json index 1f05d2e..8bb3ce4 100644 --- a/apex/manifest_codec.json +++ b/apex/manifest_codec.json
@@ -1,7 +1,4 @@ { "name": "com.android.media.swcodec", - "version": 300000000, - "requireNativeLibs": [ - ":sphal" - ] + "version": 300900700 }