diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-16 01:59:05 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-16 01:59:05 +0000 |
commit | 6273e263c30c1284e6418bd737a5289970b3c7db (patch) | |
tree | 7c940ab3f42932a1c830e09c847ff2c31578df10 | |
parent | e29a37f1443a7e4243729fd75883780c1aac66a5 (diff) | |
parent | 9e32c91b92f4605213cc890d0979ec9004c4ae4f (diff) | |
download | netd-6273e263c30c1284e6418bd737a5289970b3c7db.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_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-release
Change-Id: I8ae1db44867f849bcc5cd26b03bec2f104cb331e
-rw-r--r-- | apex/manifest.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/manifest.json b/apex/manifest.json index f3f5b029..6739a4d0 100644 --- a/apex/manifest.json +++ b/apex/manifest.json @@ -1,4 +1,4 @@ { "name": "com.android.resolv", - "version": 299900000 + "version": 290000000 } |