OSDN Git Service

Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into oc-dev am...
authorEran Messeri <eranm@google.com>
Thu, 11 Apr 2019 02:03:10 +0000 (19:03 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 Apr 2019 02:03:10 +0000 (19:03 -0700)
commitd89cac1562e8f35f1eef5003a4328189be625f22
treec5ef311b1713f2544fe71ed7ae8d6ba62e3e059f
parent19ad060bf0f64bb9b863f00ef640e38ffeedad0b
parent30826bd6587ec20e29d681148408da3fe9de5fdd
Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into oc-dev am: 07a485743a
am: 30826bd658

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