OSDN Git Service

Merge "Modify how USB connections are handled." into mnc-dev
authorNick Kralevich <nnk@google.com>
Wed, 13 May 2015 22:31:57 +0000 (22:31 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 13 May 2015 22:31:57 +0000 (22:31 +0000)
commit9831fad6768135dbd982d6dca78d7f6de81bb320
treeef56029d39afbc3a6b4c8feb563997c49e6bd192
parent645edef4834c2911386b659cc775840fb7479e01
parentfcf10f7c12cb3107bdfedce6f76a8c866d154f3c
Merge "Modify how USB connections are handled." into mnc-dev
core/res/res/values/strings.xml
core/res/res/values/symbols.xml
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java