tree ad17906d25d1ec44e8724a1c7f035ebb08e74505
parent 9ee72b0b16f71a07e62eaa4725c4e9de2631891f
parent 9f25178a9dd0aa8fab5e74f785c9997ae230a325
author Benoit Goby <benoit@android.com> 1364925798 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364925798 -0700

am 9f25178a: am 7f8fb3ff: Merge "adb: Prevent registering usb_disconnect twice" into jb-mr2-dev

* commit '9f25178a9dd0aa8fab5e74f785c9997ae230a325':
  adb: Prevent registering usb_disconnect twice