tree be2e6f2712512af4a4c76451e3c0829df8004087
parent 2c93697cfc5371afd11e486750fbabb734316ddc
parent a4802ca08bfcbf0124f5e9b959ed4e3a198d5f46
author Dan Albert <danalbert@google.com> 1429246009 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429246009 +0000

am a4802ca0: Merge "Move usb_osx to C++."

* commit 'a4802ca08bfcbf0124f5e9b959ed4e3a198d5f46':
  Move usb_osx to C++.