From: Di Lu <ludi@google.com>
Date: Thu, 20 Jul 2017 05:57:40 +0000 (+0000)
Subject: Merge "Add unit test for IpSecManager" am: dd494fa91c
X-Git-Tag: android-x86-9.0-r1~1028^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=eb7bc05b324af64c7143b48366761e2dcbd9a9f9;p=android-x86%2Fframeworks-base.git

Merge "Add unit test for IpSecManager" am: dd494fa91c
am: 73b7292a05

Change-Id: I33cb28b9ca07126e4f1b2631604fccf94ae4b530
---

eb7bc05b324af64c7143b48366761e2dcbd9a9f9