tree 24f13936d17281301fb72a0baa402c574cd16659
parent e6a6c9e68f8bcb5794c70b8321a084288701bc87
parent b3af5c95b2ae40c140fcf6648b5ed5aa75100e4f
author Sasha Smundak <asmundak@google.com> 1556645243 -0700
committer android-build-merger <android-build-merger@google.com> 1556645243 -0700

Merge "Convert hostsidetests/net/**/Android.mk file to Android.bp"
am: 9bca8f5c35

Change-Id: I45955562531b79d6601422d0d246fdbcad14bba3