Merge "Modify how USB connections are handled." into mnc-dev

author Nick Kralevich <nnk@google.com>

Wed, 13 May 2015 22:31:57 +0000 (22:31 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 13 May 2015 22:31:57 +0000 (22:31 +0000)
author Nick Kralevich <nnk@google.com>
Wed, 13 May 2015 22:31:57 +0000 (22:31 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 13 May 2015 22:31:57 +0000 (22:31 +0000)
diff --cc core/res/res/values/strings.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge
author	Nick Kralevich <nnk@google.com>
	Wed, 13 May 2015 22:31:57 +0000 (22:31 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 13 May 2015 22:31:57 +0000 (22:31 +0000)
		1	2
core/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history