commit | 1506d13810ba1bcc72c5dadbb494fb48e6e19f90 | [log] [tgz] |
---|---|---|
author | Xiao Ma <xiaom@google.com> | Thu Jan 28 07:20:29 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 28 07:20:29 2021 +0000 |
tree | be6cdac627aa62004c88f7a47252a10dd38065cd | |
parent | cdd980eed1ae22f86daf69131ef23c85dec08806 [diff] | |
parent | d2eaad9e8179548cdff33c7b08c9e1e7d6761f40 [diff] |
Merge "Support IPv4/6 address type in Struct." am: 8e555572f0 am: 543b0662f4 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1538747 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifc9eb5ed7ae692b2d0f302821d4a2c4419f50a65