OSDN Git Service

Merge "Clean up USB Manager and fix ADB." into mnc-dev
authorJeff Brown <jeffbrown@google.com>
Thu, 9 Jul 2015 20:03:26 +0000 (20:03 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 9 Jul 2015 20:03:29 +0000 (20:03 +0000)
commitc1aebfa02c393471fb344c3a94ee2ae62bb78f93
treea7ad5a19b182f4e668f5e815f8c2c2e0c4219f5f
parent968f9fdf8b2042b4d7b408f4b2a9db5008eaca6e
parent460a146eb8f827e4e70f2dd93d1ba852d0feb06b
Merge "Clean up USB Manager and fix ADB." into mnc-dev
core/res/res/values/strings.xml
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
services/usb/java/com/android/server/usb/UsbService.java