tree 6e8fd03d00c9a2e0114839b0d0cf77fd562f202f
parent b2cf723e43de0a4ba72e38865e7c57bceda8aaae
parent 42293ba74d822cfca6ab7f73d7c8c142c9979973
author Lorenzo Colitti <lorenzo@google.com> 1516109686 +0000
committer android-build-merger <android-build-merger@google.com> 1516109686 +0000

Merge "Update netId to nethandle mapping in NetworkTest." am: 42293ba74d
am: 503135596b

Change-Id: I5e8e57f38580742eae38f63f43e37cc647412212