diff options
author | Narayan Kamath <narayan@google.com> | 2018-03-02 11:41:51 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-03-02 11:41:51 +0000 |
commit | 6ae402aa03bbc08d5007bcd2c4fac05dc3da0092 (patch) | |
tree | c3306e7eb74c86bd077cbf334168a804c36408a8 | |
parent | e84b3dff7e80c5476ae65bf5a1d4245663cfdfff (diff) | |
parent | 2b76b17978faca03e68fbb703553fdf6c0dfeb09 (diff) | |
download | okhttp-pie-dr1-release.tar.gz |
Merge "Track renaming of bouncycastle-nojarjar -> bouncycastle-unbundled." am: 77d960f3bb am: 950d61d946android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11sparse-7280205-L43500000878529863pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
am: 2b76b17978
Change-Id: I6936aebdddf3b5a6855cba7153111ceed26557e1
-rw-r--r-- | Android.bp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -76,7 +76,7 @@ java_library_static { libs: [ "okhttp-nojarjar", "junit", - "bouncycastle-nojarjar", + "bouncycastle-unbundled", "conscrypt", ], no_framework_libs: true, |