Commits
Nick Kralevich authored and Android Git Automerger committed 09097c1fbcaM
am 5fa85ce6: (-s ours) am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev * commit '5fa85ce6f818f97d5c60b8ccdfe84b337fb3f732':
Showing diff to00d032aa974