Merge "Reword analog audio not supported notification" into oc-dr1-dev

author Badhri Jagan Sridharan <Badhri@google.com>

Tue, 1 Aug 2017 19:03:55 +0000 (19:03 +0000)

committer android-build-merger <android-build-merger@google.com>

Tue, 1 Aug 2017 19:03:55 +0000 (19:03 +0000)
author Badhri Jagan Sridharan <Badhri@google.com>
Tue, 1 Aug 2017 19:03:55 +0000 (19:03 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 19:03:55 +0000 (19:03 +0000)
diff --cc core/res/res/values/strings.xml
Simple merge
diff --cc services/usb/java/com/android/server/usb/UsbDeviceManager.java
Simple merge
author	Badhri Jagan Sridharan <Badhri@google.com>
	Tue, 1 Aug 2017 19:03:55 +0000 (19:03 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 1 Aug 2017 19:03:55 +0000 (19:03 +0000)
		1	2
core/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/usb/java/com/android/server/usb/UsbDeviceManager.java	patch \|	diff1 \|	diff2 \|	blob \| history