tree aa7ef10564752ad0a5ebe6ce1849544788ea14ff
parent 860297b91a1f2bb7acd36c943cbdb93d4547fc65
parent 2d2346e0948f5abfc502b90997ee377e0f261863
author Jerry Zhang <zhangjerry@google.com> 1476752406 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1476752409 +0000

Merge changes from topics 'usb_bugfixes', 'usb_bugfixes2'

* changes:
  Revert: Remove the kick from config switches in UsbDeviceManager
  Clean up persistent usb state on boot.