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)
am: c93df5ca1c

Change-Id: I45289bc8e8b93f7eb912a76a10b951b1a615338a


Trivial merge