commit | 11cb1537b45a8c74481d10615da3c4bf2a8c9e2b | [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 | 3184b85e7024e65bdf2aa4211461197b6b8ce55a | |
parent | ed123bffbfacb703a3cea394382abae816a4035d [diff] | |
parent | 53133f708e810ff361a451a80e4d1c46dc6af9d1 [diff] |
Merge changes from topic "add-ikev2-vpn-types" am: adb79e3b39 am: 6e1557d8ca am: 53133f708e Change-Id: I4ff406efcaada5a9306afc79290cb37bdeef71f2