tree ce71eac898c0dbf141d7b6492c43abb02d4e013f
parent ae62bfc3461c5e4dd3635b7eb46280a2f66ff26f
parent aa983b7f1c74ac2399b5b90156237e8007823a6e
author Remi NGUYEN VAN <reminv@google.com> 1548113777 -0800
committer android-build-merger <android-build-merger@google.com> 1548113777 -0800

Merge "Add fields used by NetworkStack to the API"
am: aa983b7f1c

Change-Id: Iaf2dfea8263a1c7e78130222126e2ebbaa84fedd