Merge "Fixing a NPE in DevicePolicyManagerService" into nyc-dev am: 6c917901cf
am: a582dd0090
* commit 'a582dd00907786132ad8eac650965718fa9e7ba9':
Change-Id: I16044e14b9e3dc2108ab48571225cae027abbc20
This commit is contained in: