| commit | 0d68733d6363c270aed49b9be40c2b8ca41c3c52 | [log] [tgz] |
|---|---|---|
| author | Divya Sharma <divyash@codeaurora.org> | Mon Feb 12 14:02:41 2018 -0800 |
| committer | Divya Sharma <divyash@codeaurora.org> | Tue Feb 13 09:05:55 2018 -0800 |
| tree | fe19e564c887fdbe648102e0a33d6d4d4e30226a | |
| parent | 8abd70f6c86d4ccd0e88f96bac68a396a5e01d3a [diff] | |
| parent | 18444cf0a96a0a5dd06338713ed1e2c23f99b88b [diff] |
PPR1.180206.003_AOSP_Merge Conflicts: services/usb/java/com/android/server/usb/UsbDeviceManager.java Change-Id: Ic90176e5e5e5cede18090199c39b57f6c7f80deb