Merge branch 'android-proposals'
authorTobias Brunner <tobias@strongswan.org>
Tue, 28 Nov 2017 15:23:41 +0000 (16:23 +0100)
committerTobias Brunner <tobias@strongswan.org>
Tue, 28 Nov 2017 15:23:41 +0000 (16:23 +0100)
commit0729be1bfed6fb1d238d7d8a3d4771563df9b5a3
tree8959528277e189761775600ac4e1426a2549c2e9
parent4a79434b1144cb26c7b3c35466c092a9bea5d8a6
parent5a6f687bdf83db15054d6a5e2b60429eb6b1308a
Merge branch 'android-proposals'

Makes IKE and ESP proposals configurable.
src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c