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