OSDN Git Service

Merge "Add test case for user quota management in IpSecService" am: cf1a4614e1
authorDi Lu <ludi@google.com>
Wed, 15 Nov 2017 20:31:37 +0000 (20:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Nov 2017 20:31:37 +0000 (20:31 +0000)
commit0ec853390ac9f35a195478472a10f6c0f40c577d
tree3a628e3551a4611c3b70cebfd4ffcf8116460798
parent858c934b5d489152a5b9011acca3fdec41e6da2a
parentc9c65317e883bad71de29a2a5db26f9f01818ce2
Merge "Add test case for user quota management in IpSecService" am: cf1a4614e1
am: c9c65317e8

Change-Id: I1022151e9317194ac45501a59f68c9bba89e16df