OSDN Git Service

Merge "Fix DPM unit tests, also fix a log message." into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Fri, 23 Sep 2016 15:34:37 +0000 (15:34 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 23 Sep 2016 15:34:40 +0000 (15:34 +0000)
commit18fb24c5d3e8f9e2a66e78f13a7fa2567fbd3231
treebb1f9c4bb34d616e8adfc5417be391bf4a62f75f
parent69659cb96df2b149bbb0577179f16712054a8bc2
parent6ad5f92512462f774a2ff7e59abdf5edbfd215b3
Merge "Fix DPM unit tests, also fix a log message." into nyc-mr1-dev
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java