tree a1424d2fb7f55bdb772c146e4bdf751cc4c381e2
parent 554d12c9427ddc385590e922916db5de0ff2dfbe
parent 91625677b37e04c329fd1e0b50c468aa6efccc99
author Adam Vartanian <flooey@google.com> 1508147018 +0000
committer android-build-merger <android-build-merger@google.com> 1508147018 +0000

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

Change-Id: Ida53271e3ab3f80a8108b4f3eac1063ccda0cfde