diff options
| author | Narayan Kamath <narayan@google.com> | 2018-03-02 11:10:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-02 11:10:13 +0000 |
| commit | 77d960f3bba09b4a3c53c41bb7a8e3cad6dfc57b (patch) | |
| tree | c3306e7eb74c86bd077cbf334168a804c36408a8 | |
| parent | 67b1e00690f9514be03d1f77e6038a06c7170cd7 (diff) | |
| parent | 34f350f4b67a8f88da2edeba1a9b9a9b99a6bdb6 (diff) | |
| download | okhttp-o-mr1-iot-preview-8.tar.gz | |
Merge "Track renaming of bouncycastle-nojarjar -> bouncycastle-unbundled."android-wear-p-preview-2android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7
| -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, |