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