tree 226704c36082e8be9e4ee952e64c673682e99740
parent c884e2fd106ebc0f6ddaaac7aec57045c67e9e99
parent c4c5079a0972e22f463b62fff777e353ad5d9510
author Remi NGUYEN VAN <reminv@google.com> 1548115073 -0800
committer android-build-merger <android-build-merger@google.com> 1548115073 -0800

Merge "Add fields used by NetworkStack to the API" am: 79a6d5e30c am: 4bf93bb9c4
am: c4c5079a09

Change-Id: I865a0298a17582c1c2d1f1eeb086979f8955ac33