commit | 336e7f1856fb0f3d8c914ae23a01d2b4f2ba0289 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 24 07:59:53 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 24 07:59:53 2020 +0000 |
tree | 3ad2a906614cc7f66d39231392f3a3182f4072ea | |
parent | 64f11ee82a0baba16f8602655d34370d9ffd9695 [diff] | |
parent | b9df8248fa5112d1015d805d2a775051b0b66364 [diff] |
Merge "Add IKEv2/IPsec VPN options" am: b189ffb318 am: 9d5397ab42 am: b9df8248fa Change-Id: I50104a17fd5b7d07cb50b9d6fcc002d7cfd96b6c