diff options
| author | 2022-04-19 18:15:25 +0000 | |
|---|---|---|
| committer | 2022-04-19 18:15:25 +0000 | |
| commit | 60e060a4fa86e11ffa9e1a86c18b4fa11275be17 (patch) | |
| tree | 604413841a0b5f2b7ce41f2b0cabf2d41ee1d679 /libs/androidfw/AssetsProvider.cpp | |
| parent | a8a543873f8a1ebf804ebeded679e9f0a0355d17 (diff) | |
| parent | 050de9ffe093181d27bfe491cf7825e5cc2f8dfb (diff) | |
Merge "Support Ikev2VpnProfile provisioned with IkeTunnelConnectionParams" am: a2ec01c7a1 am: b241c0a1af am: 050de9ffe0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2062248
Change-Id: Id504e6f0019cf206855b7d9cf9f262a760b5f136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions