diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-16 01:58:50 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-16 01:58:50 +0000 |
| commit | 298e4982d7a78e36d1faadb9e87a9ed6171cc6d4 (patch) | |
| tree | 69a2c86b3a83566da04f7d0711a345b36cd5def3 | |
| parent | ade4d4fe2619c97a4a1f3e4e4a9500f54f4fb111 (diff) | |
| parent | 1a0acae481ef2eb1fd174d2da772cefaa287c781 (diff) | |
| download | conscrypt-android10-qpr2-s2-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_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: If92c2e6faec63d71686251c0eb8f7dec16f67498
| -rw-r--r-- | apex/apex_manifest.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/apex_manifest.json b/apex/apex_manifest.json index 03a903ec..9c7c52ab 100644 --- a/apex/apex_manifest.json +++ b/apex/apex_manifest.json @@ -1,4 +1,4 @@ { "name": "com.android.conscrypt", - "version": 299900000 + "version": 290000000 } |