commit | aac387b406a64cfc44f29f35a53db0ecfef18837 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jul 02 19:25:06 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 02 19:25:06 2021 +0000 |
tree | b5d1eca5124732b0d1a69735eb274f86568f1e6b | |
parent | a97443a66753fe662295038ba2ee1ba088a77885 [diff] | |
parent | b8beb3d6d29ffb4c754505ee4b44399e80e92a92 [diff] |
[automerger skipped] Merge "Allow non-VPNs to have underlying networks." into sc-dev am: 0868536de9 am: b8beb3d6d2 -s ours am skip reason: Merged-In I53d6080f48707ff3c37fbfbef534284ba77a7432 with SHA-1 4703a8c392 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15182605 Change-Id: I491bbd1d302470f2aabdb802fa403c26ab8d8a16