Merge "Stop using the hidden constructor of Network()"
am: a48458c4a3

Change-Id: I1004c0cfe667ee41c426c39db08e6006069a4f48
tree: de59afb07fc44c5e077815e998eef783625dc9a6
  1. service/
  2. PREUPLOAD.cfg