tree 3cc38e158cbb3a4a6fc9abd13e57267121487c7a
parent 3dcb3ec5a309c2505ad4f74db7725645b6c39cdf
parent 0ec853390ac9f35a195478472a10f6c0f40c577d
author Di Lu <ludi@google.com> 1510778393 +0000
committer android-build-merger <android-build-merger@google.com> 1510778393 +0000

Merge "Add test case for user quota management in IpSecService" am: cf1a4614e1 am: c9c65317e8
am: 0ec853390a

Change-Id: I84e81e261c93d2199e4932431ee57b75496ea2d5