OSDN Git Service

Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest."
authorFelipe Leme <felipeal@google.com>
Mon, 12 Dec 2016 23:12:25 +0000 (23:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Dec 2016 23:12:25 +0000 (23:12 +0000)
commit9f0030a98aba49850cc2828c04d6c8fe97cfef37
treee0a82ce8b794566a4a20b13a77c1c64d24c8977b
parenteaed9ef0b77d9fac9bba25e5a0f1081b2763c1f9
parentd0fdf7aba3902e337e32ded27396a83d8dbd4a04
Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest."
am: d0fdf7aba3  -s ours

Change-Id: I3720f2e2fd0c78c9d45e0b26e7157902a32fae76