OSDN Git Service

Merge "Update netId to nethandle mapping in NetworkTest." am: a04d0cc72f
authorLorenzo Colitti <lorenzo@google.com>
Tue, 16 Jan 2018 13:34:46 +0000 (13:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Jan 2018 13:34:46 +0000 (13:34 +0000)
am: 503135596b

Change-Id: I5e8e57f38580742eae38f63f43e37cc647412212


Trivial merge