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)
commitb8ab1d404b67411212c5ae78eee61ffd278a2f63
tree2772403108281cebc9cbeb6a32acfc58b606fa17
parenta50d609e2f12f78a6e2412d264579a67fde4045e
parent7a8f0dc0c0608efbb4a65ccece2c425baf10170f
Merge "Validate IpSecAlgorithm Length" am: 68b81299d2 am: 5e3d66e78b
am: 7a8f0dc0c0

Change-Id: I1a28d860ac7125afc1f82ac17d1834b0121c0e11