tree f8274acfc558250dde516ab9a9a2dc35bcc11ce1
parent 858bdb46a51cc462242c946351f75e6476307043
parent 8a5796b1c54e1c3e42581ee6628fb55895998d90
author Elliott Hughes <enh@google.com> 1433295107 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433295107 +0000

am 8a5796b1: am 98a4dd48: Merge "\'usb\' doesn\'t need to be global in fastboot."

* commit '8a5796b1c54e1c3e42581ee6628fb55895998d90':
  'usb' doesn't need to be global in fastboot.