tree 652124c6fe30b82be1c387610ff2cea75a578235
parent d4eed7352d3c1d6b4970da6d01f92babf67b0cba
parent 13f2f93cd3ca285679cb356643c0c27d6ec3ec67
author Remi NGUYEN VAN <reminv@google.com> 1552356363 -0700
committer android-build-merger <android-build-merger@google.com> 1552356363 -0700

Merge "Use an in-process APK for in-process NetworkStack" am: b8f2ab9362
am: 13f2f93cd3

Change-Id: I9018b01f0cf60a8595506cc347f4afac32684e2f