| commit | 64448a30675d5904821ad1ce92d9dcb75852a8dd | [log] [tgz] |
|---|---|---|
| author | Matt Buckley <mattbuckley@google.com> | Fri Jan 07 18:09:28 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 07 18:09:28 2022 +0000 |
| tree | 497d81d2af869fe1f267cda475ac3ed3f57ebad9 | |
| parent | 033367bbc7ea3d9e255d79bf65d1419fe8958ca0 [diff] | |
| parent | 7178c3dc336ddce35fb8ac8cd0028f58487d357f [diff] |
Merge "Revert "Revert "Revert "Add VpnServiceBuilderShim for VpnService..."" am: 7178c3dc33 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1941193 Change-Id: I47d2d409b218b6ae52b9469f26b1aded23c2c7e9