tree 160fda9cd922801ae8c6ca6fe8fcc27b5a07b6f0
parent 332973d177c1e5e31115553c2c6bc65e2016873f
parent 12e967c0ae90ce436e6eb2fd213bdbb6599df035
author Lorenzo Colitti <lorenzo@google.com> 1556740014 -0700
committer android-build-merger <android-build-merger@google.com> 1556740014 -0700

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

Change-Id: I0a361fc6668bd091a86059cad874b14bef003043