Merge branch 'no_usb_debug_windows'
authorTom Rondeau <trondeau@vt.edu>
Wed, 24 Nov 2010 00:44:58 +0000 (19:44 -0500)
committerTom Rondeau <trondeau@vt.edu>
Wed, 24 Nov 2010 00:44:58 +0000 (19:44 -0500)
commit696684176317d555ac4a603212bca1bafc768aec
tree299334182ee127199bd277821efa7cac39ac94f6
parent9922d3553e4e3ec6d55cfe8b7aab9323f649247f
parenta45a71005ba215673da78fabc0edae323eebed34
Merge branch 'no_usb_debug_windows'