commit a66592bf964df38810f7aa0eba490ab11984ec87
author android-build-team Robot <android-build-team-robot@google.com> Thu Jan 16 01:59:11 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jan 16 01:59:11 2020 +0000
tree 07b4a7055415cb2d4e78720a9c622658bc9151aa
parent b8d065aa788982832fe19663bb2017a1d3ed2dde
parent a7e38f8c56e83a14c1143c81627d41e0cd97c17d

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

Change-Id: I0140f120d6df40e623aaf81b7314334691b62e28

apex/manifest.json

diff --git a/apex/manifest.json b/apex/manifest.json
index b11187d..3011ee8 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.media",
-  "version": 299900000
+  "version": 290000000
 }

apex/manifest_codec.json

diff --git a/apex/manifest_codec.json b/apex/manifest_codec.json
index 09c436d..83a5178 100644
--- a/apex/manifest_codec.json
+++ b/apex/manifest_codec.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.media.swcodec",
-  "version": 299900000
+  "version": 290000000
 }