Lucas Lin 7db5f91856 [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

2021-12-23 13:13:29 +00:00

..

android

Merge "[MS15.2] Move SUBSCRIBER_ID_MATCH_RULE_* constants to static lib"

2021-12-23 01:35:00 +00:00

com/android

[conflict] Merge "Add test for Vpn#prepare()" into sc-dev am: f89a629776 am: 66737a8c5d

2021-12-23 13:13:29 +00:00