OSDN Git Service

Merge "Add validation to IpSecConfig algorithm setters" am: a954f20f46
authorBenedict Wong <benedictwong@google.com>
Tue, 9 Jan 2018 19:51:19 +0000 (19:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Jan 2018 19:51:19 +0000 (19:51 +0000)
commit764a0b739a48e4352579256403c89ee218afb89e
tree5604a99a0ba707d459e3aa3b8d4236e2422a24a6
parent536078de967ece638b7b407df8ef7c284c9af2c7
parentc93df5ca1c974960f1694647d28b157b512d9ceb
Merge "Add validation to IpSecConfig algorithm setters" am: a954f20f46
am: c93df5ca1c

Change-Id: I45289bc8e8b93f7eb912a76a10b951b1a615338a