| commit | 7db5f9185678ce78dd7f03ab2c85eb85fe615f28 | [log] [tgz] |
|---|---|---|
| author | Lucas Lin <lucaslin@google.com> | Thu Dec 23 12:55:00 2021 +0000 |
| committer | Lucas Lin <lucaslin@google.com> | Thu Dec 23 13:13:29 2021 +0000 |
| tree | 84d0090e8781c699f2630ae8c1ab61bd912bb8c3 | |
| parent | 8d8cf85d5c01144999ea3a82c38960ad3dffefed [diff] | |
| parent | 66737a8c5d1a902a585de6fae0ae3234ddd8bbeb [diff] |
[conflict] Merge "Add test for Vpn#prepare()" into sc-dev am: f89a629776 am: 66737a8c5d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15606164