OSDN Git Service

Merge "Add Network security watchlist service" am: e672ab4c0a
authorHugo Benichi <hugobenichi@google.com>
Tue, 14 Nov 2017 01:35:24 +0000 (01:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Nov 2017 01:35:24 +0000 (01:35 +0000)
commit652056767ca1e0fec0d64831c95433bb76844279
tree4a796406d72b4410f604d79d92984ec5300499d6
parentb79fefb75a06ff8172d10ddf6deb9424b50d7b50
parent1aff5336e0ce5e278628d32e873c2354dba0c037
Merge "Add Network security watchlist service" am: e672ab4c0a
am: 1aff5336e0

Change-Id: I08c10fccb2a8c814c1bedb6ad2a17b843a5af722
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java