tree a1424d2fb7f55bdb772c146e4bdf751cc4c381e2
parent 69707680a64926b415c8770933f731d5ba916f6d
parent c113258c92cefc6539058424c24e131bd6b31471
author Adam Vartanian <flooey@google.com> 1508147177 +0000
committer android-build-merger <android-build-merger@google.com> 1508147177 +0000

Merge "Change OkHttp test infrastructure to not use BC provider" am: 157721cd6c am: b546444591 am: 91625677b3
am: c113258c92

Change-Id: I4bdb308f319803fd6db80b4e5f46986316b249aa