OSDN Git Service

am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device...
authorMike Lockwood <lockwood@google.com>
Wed, 8 Jan 2014 16:08:17 +0000 (16:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jan 2014 16:08:17 +0000 (16:08 +0000)
commit43bc1c07d25b7f278a860bbb9118f46ac732593a
treeaa17f912df5d35a9bd9e51076fb93707c307b14c
parente853de1f10820da1bc7b6bf13faadaf835239c29
parentd9e708e365d94e83ec135f1486129febd3f8eaea
am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"

* commit 'd9e708e365d94e83ec135f1486129febd3f8eaea':
  Added missing USB device descriptor fields needed for intent filters
services/core/java/com/android/server/usb/UsbHostManager.java
services/core/java/com/android/server/usb/UsbSettingsManager.java
services/core/jni/com_android_server_UsbHostManager.cpp