tree a1424d2fb7f55bdb772c146e4bdf751cc4c381e2
parent e6d915d78ecdb0f4d4428cb5421615473601ab4f
parent 157721cd6c892f9238eac1acfabaf4f4d4a1e4e6
author Adam Vartanian <flooey@google.com> 1508146627 +0000
committer android-build-merger <android-build-merger@google.com> 1508146627 +0000

Merge "Change OkHttp test infrastructure to not use BC provider"
am: 157721cd6c

Change-Id: I66a2c7fc7313e989504839617b466d86eae59904