tree a552b81824600dea4960c1952c2e185e6ba84ffa
parent 92600e3fda5ac304044c54ce90ad0525e312e917
parent ba2f3d2fdf6b5e18c791c0433ccf08c279f43074
author Remi NGUYEN VAN <reminv@google.com> 1553239281 -0700
committer android-build-merger <android-build-merger@google.com> 1553239281 -0700

Merge "Fix targetSdkVersion for NetworkStack" am: 42b97de9d3
am: ba2f3d2fdf

Change-Id: I7be8a9f1020d56cdf9ac87a47a25cab77d66958e