tree 478aaa35c30c809fca3e7b47c1d465dbec32198c
parent 905ffc20f33fee1fa09dea038e1f36e6ab870fec
parent d9facaa7f0d0bfcda71c96abbf988814988264a0
author Lorenzo Colitti <lorenzo@google.com> 1556722440 -0700
committer android-build-merger <android-build-merger@google.com> 1556722440 -0700

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

Change-Id: I3b8ee71bb61512a66f42deec3154712c3adf4d7a