From: Dianne Hackborn <hackbod@google.com>
Date: Tue, 2 May 2017 18:00:22 +0000 (+0000)
Subject: Merge "Work on issue #37815224: DeviceManagementService is incorrectly..." into oc... 
X-Git-Tag: android-x86-9.0-r1~4576
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=55b4d62c4bd903d6fff17a468830acd1d61c17a3;p=android-x86%2Fframeworks-base.git

Merge "Work on issue #37815224: DeviceManagementService is incorrectly..." into oc-dev am: 72c0ab518a
am: c812cf27ab

Change-Id: I7a7b4b17a4eeeeda7619e6fa9702ef059af7d76f
---

55b4d62c4bd903d6fff17a468830acd1d61c17a3