commit | 7b9dcbd076568122f7a257080dc95ac6cb5320e9 | [log] [tgz] |
---|---|---|
author | Xiao Ma <xiaom@google.com> | Thu Jan 28 07:21:55 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 28 07:21:55 2021 +0000 |
tree | be6cdac627aa62004c88f7a47252a10dd38065cd | |
parent | 10640eaba0030e0cc2b68a4ae2fa0cca23c0ff41 [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: I3ad45557df94791d1125c5792fded9c5c2ed0976