summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-01-16 01:59:11 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-01-16 01:59:11 +0000
commita66592bf964df38810f7aa0eba490ab11984ec87 (patch)
tree07b4a7055415cb2d4e78720a9c622658bc9151aa
parentb8d065aa788982832fe19663bb2017a1d3ed2dde (diff)
parenta7e38f8c56e83a14c1143c81627d41e0cd97c17d (diff)
downloadav-android10-qpr2-s1-release.tar.gz
Merge cherrypicks of [10101230, 10101593, 10101594, 10101595, 10101362, 10101479, 10101363, 10101110, 10101480, 10102031, 10102032, 10101596, 10101364] into qt-qpr2-releaseandroid-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr2-s1-release
Change-Id: I0140f120d6df40e623aaf81b7314334691b62e28
-rw-r--r--apex/manifest.json2
-rw-r--r--apex/manifest_codec.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/apex/manifest.json b/apex/manifest.json
index b11187de6a..3011ee832e 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
{
"name": "com.android.media",
- "version": 299900000
+ "version": 290000000
}
diff --git a/apex/manifest_codec.json b/apex/manifest_codec.json
index 09c436d1a7..83a517859b 100644
--- a/apex/manifest_codec.json
+++ b/apex/manifest_codec.json
@@ -1,4 +1,4 @@
{
"name": "com.android.media.swcodec",
- "version": 299900000
+ "version": 290000000
}