| commit | 27bb67c35bcf9c8a649fb6e6e433af4e850d4ac3 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon Apr 20 11:37:18 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 20 11:37:18 2020 +0000 |
| tree | 9e1424d74398a3588edb2e42ec7ac6560e719c1c | |
| parent | 4d894c7e585a1b2ba4f48e918a0208cea392212a [diff] | |
| parent | a00f03dd613c70b54be73f165dba3e8950859607 [diff] |
Merge "Support learning the NAT64 prefix from two different sources." am: 204b31920f am: a00f03dd61 Change-Id: I0c7e48c0b16fe09269ced98712bd636105f46a5c