tree e929cfe6b2d6822be4e1590122ac3c5935ebc67b
parent 989ab78b0d3466eb5aaea3ae8ecf325a0f763302
parent 625173c148a8b5adedbdfa754c1a03162ccf1fc2
author Lorenzo Colitti <lorenzo@google.com> 1556721059 -0700
committer android-build-merger <android-build-merger@google.com> 1556721059 -0700

Merge "Make NetworkStack actually build in an unbundled setup."
am: 625173c148

Change-Id: Ib76bcc82b2562831934a81d4536e83f37c08b3e8