tree e0165d7162ce6a390f398ee2f3e523170aabc1df
parent db60756f2f2a20d59f087cde0149339f41f7f7a5
parent ca980ac83c7c8173217c5de39b86f3ce3f11bea4
author Neil Fuller <nfuller@google.com> 1539634951 -0700
committer android-build-merger <android-build-merger@google.com> 1539634951 -0700

Merge "Remove explicit dependencies on conscrypt"
am: ca980ac83c

Change-Id: I44d73ff073dcdd566e95dd89a08490f8afdf833f