| commit | e01cba934098d404109806008c205ba6682b164b | [log] [tgz] |
|---|---|---|
| author | Cassie Wang <cassiewang@google.com> | Mon Jun 19 14:18:03 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 19 14:18:03 2023 +0000 |
| tree | a4d45b662ab909513a7104b12b1da5f2d1514b67 | |
| parent | 4a94dc7bf3c5e730a434c4ed38945118b834c60d [diff] | |
| parent | dfe37ce1690b5fbaf7c4448f378ba35e3240a292 [diff] |
Merge "Add checks around CONTROL_VPN permission during prepare()" am: 04f3dc871d am: e9c82f087a am: b47252b556 am: dfe37ce169 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624812 Change-Id: I33fc6b1a19c84bc568e5492474b9da77cb5b7b48 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>