OSDN Git Service

Merge "Tidy up MockWebServer usage" am: 294ab080f4 am: d0dc901341 am: 47eedc3503
authorNeil Fuller <nfuller@google.com>
Tue, 9 Aug 2016 16:38:55 +0000 (16:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Aug 2016 16:38:55 +0000 (16:38 +0000)
am: cfc82ac074

Change-Id: I9a27fe8d2769efee97e2d5be719d783ac1a34de1


Trivial merge