| commit | 4d982596363d045a4be11f0872016867f377d0c6 | [log] [tgz] |
|---|---|---|
| author | Lucas Lin <lucaslin@google.com> | Thu Dec 23 15:56:17 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 23 15:56:17 2021 +0000 |
| tree | 8c2eb7512ab5d2791e5656a7b08e265b980bd6b6 | |
| parent | 7ab020886d1e7f0665115e816cf0cb8e81401a35 [diff] | |
| parent | 5588b547daa5ea19f481a666049ff8f40b00ae5a [diff] |
Merge "[conflict] Merge "Add test for Vpn#prepare()" into sc-dev am: f89a629776 am: 66737a8c5d" into sc-qpr1-dev-plus-aosp am: cbab8c3ca9 am: 5588b547da Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16527483 Change-Id: Ie68b3778c7461a2874db7321c91d65a2873b6de5