am 7f2ad58a: adb: Add Qualcomm USB id
Merge "Let "adb connect" connect to emulators too - adb can now connect to an emulator configured with an arbitrary   pair of <console port, adb port>. These two ports do not have to be   adjacent.   This can be done from the commandline at any time using   adb connect emu:<console_port>,<adb_port> - Emulators running on ports outside the normal range   (5554/5555-5584/5585) register themselves on startup if they follow   the convention "console port+1==abd port". - Emulators outside the normal port range will not be auto-detected on   adb startup as these ports are not probed. - The index into local_transports[] array in transport_local.c does no   longer indicate the port number of the local transport. Use the altered   atransport struct to get the port number. - I have chosen not to document the adb connect emu:console_port,adb_port   syntax on adb's help screen as this might be confusing to most readers   and useful to very few. - I don't expect this to introduce any (backwards) compatibility issues."
Merge changes If8e07502,I48c84fab

* changes:
  Fix adb remount on non-MTD devices
  mount: Add support for remounting without specifying device
libusbhost: new library for Linux USB host support.

Supports access to Linux usbdevfs on both device and Linux host.

Change-Id: Ie88a5193be3ee715792b10b34b3da32ffc4ca57b
Signed-off-by: Mike Lockwood <lockwood@android.com>
adb: Use new libusbhost library for USB support on Linux host.

Change-Id: I341e3be0a3eed48b6c5b6559fdbd0e956e2d8fb9
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '30ff2c70ce05d761e8cb0ab7ee02b39a681fe0cb' into oxygen_4.3

* commit '30ff2c70ce05d761e8cb0ab7ee02b39a681fe0cb':
  libusbhost: new library for Linux USB host support.
Merge (-sours) commit 'd7249c45f6c245652de7c510d450f4577dc19197' into oxygen_4.3

* commit 'd7249c45f6c245652de7c510d450f4577dc19197':
  adb: Use new libusbhost library for USB support on Linux host.