| commit | 4c4f42a7f50450d798a606dbce0cafdb2efc1e7d | [log] [tgz] |
|---|---|---|
| author | Mark Chien <markchien@google.com> | Mon Oct 12 10:03:26 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 12 10:03:26 2020 +0000 |
| tree | d75f11ed7442434a5af3aae1df296da5f88002f6 | |
| parent | 824bb62751bce03267bc1ad86149f35a8d73ad85 [diff] | |
| parent | ce9b47e54230a19c84ecd434d9ad7473f5a4dc63 [diff] |
Merge changes I60ed5465,I70b49d0a into mainline-prod * changes: Make the IP subnet persistent till reboot Make PrivateAddressCoordinator ignore vpn network