OSDN Git Service

Merge "Reword analog audio not supported notification" into oc-dr1-dev
authorBadhri Jagan Sridharan <Badhri@google.com>
Tue, 1 Aug 2017 19:03:55 +0000 (19:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 19:03:55 +0000 (19:03 +0000)
commitfb80072f9926ea74f2e957fc86eb935ac753e01d
tree7b67f7af115d8dc30d28fff32abac5ca5a5fbb33
parentc199e3fdf18e23774dd0d9f6837dca8c0dc579c9
parent69840ca338347a1c2607d0f40d061c7be0e0c584
Merge "Reword analog audio not supported notification" into oc-dr1-dev
am: 69840ca338

Change-Id: I6a9a611c13de7a63e6d5bdbf4718827f2295a28b
core/res/res/values/strings.xml
services/usb/java/com/android/server/usb/UsbDeviceManager.java