OSDN Git Service

Merge "Validate IpSecAlgorithm Length" am: 68b81299d2 am: 5e3d66e78b
authornharold <nharold@google.com>
Tue, 5 Dec 2017 02:46:06 +0000 (02:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Dec 2017 02:46:06 +0000 (02:46 +0000)
am: 7a8f0dc0c0

Change-Id: I1a28d860ac7125afc1f82ac17d1834b0121c0e11


Trivial merge