OSDN Git Service

Merge "Reword analog audio not supported notification" into oc-dr1-dev am: 69840ca338
authorBadhri Jagan Sridharan <Badhri@google.com>
Tue, 1 Aug 2017 19:15:49 +0000 (19:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 19:15:49 +0000 (19:15 +0000)
commite15b5619c5405ec57119611733929f091a7e3cbc
treed932fbc08406d756cb661e4c0c86f0ab00fe2dca
parent055bbecbcbbe95fea9b00cd92242e366aac090fc
parent89163cf020e19ab2233759da69b2490e7524ca5b
Merge "Reword analog audio not supported notification" into oc-dr1-dev am: 69840ca338
am: 89163cf020

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