OSDN Git Service

Merge "Remove ptp from persist config on boot" into oc-dev am: 1d1cf13056
authorJerry Zhang <zhangjerry@google.com>
Mon, 5 Jun 2017 18:54:08 +0000 (18:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 5 Jun 2017 18:54:08 +0000 (18:54 +0000)
commit42f4815eff4028c34bf496d30474b042a72d279f
treed66278415422ce35de2377744ab6106c384cbfe1
parent6256362a127597d6ba98a4795468d67b29af3833
parent8d5570b9e1075b759f1f465d77f19986523d1974
Merge "Remove ptp from persist config on boot" into oc-dev am: 1d1cf13056
am: 8d5570b9e1

Change-Id: I792ed0959e5a24ef8893a1bd63e3a33278462556
services/usb/java/com/android/server/usb/UsbDeviceManager.java