am 8f47c626: am 7ca91d08: Merge "Android SDK Windows USB driver: Project Tango pid"

* commit '8f47c626099cbae6eb4c8ed1af1ac5bc41a54dff':
  Android SDK Windows USB driver: Project Tango pid