OSDN Git Service

resolve merge conflicts of c874e60 to master
authorGreg Plesur <plesur@google.com>
Fri, 4 Nov 2016 16:34:30 +0000 (12:34 -0400)
committerGreg Plesur <plesur@google.com>
Fri, 4 Nov 2016 16:34:30 +0000 (12:34 -0400)
commitd1ceaff82c8ca6a690d19a87d1a39ecdc1881bb8
treee737cca07c9341e7a745ab8bc70728307c8adcee
parentad9d3632d1d2b1e8df3c7fb5d9d3bcf3f8914385
parentc874e600029d87c41c797946191f5ae7b4835794
resolve merge conflicts of c874e60 to master

Change-Id: I39381c516e4a1267d06e3f7b682d1cf73eeb6f9b
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java