OSDN Git Service

Merge "Fix testApplicationRestrictionsManagingApp unit test" into nyc-dev
authorRubin Xu <rubinxu@google.com>
Fri, 12 Feb 2016 11:53:44 +0000 (11:53 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 12 Feb 2016 11:53:45 +0000 (11:53 +0000)
commitd6c90a88831af5c8d3a3587173873031cf6f5d7f
tree9f7aa2cb007864a3b7b3c8b209dbde7781de69d3
parent43bb0a06434425555a869075f8f27dfc64548de0
parented1928a981cbff9a67b5c1786ded8cbdf848056b
Merge "Fix testApplicationRestrictionsManagingApp unit test" into nyc-dev
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java