OSDN Git Service

Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest." am: d0fdf7aba3 -s ours
authorFelipe Leme <felipeal@google.com>
Mon, 12 Dec 2016 23:18:29 +0000 (23:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Dec 2016 23:18:29 +0000 (23:18 +0000)
commitedb11059e7fc6d201a0fb2b9621d5288af33f419
tree6b4a64316f327cb68c01ebdc1b82ac561af82632
parent60a850b670177486c15e8325ff9cc93718a54ace
parent9f0030a98aba49850cc2828c04d6c8fe97cfef37
Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest." am: d0fdf7aba3  -s ours
am: 9f0030a98a  -s ours

Change-Id: Ifd564eb7e8260b0642805abf4621d77c0381a5a2