am aa313948: am d02b00dd: Merge "Fix UsbDebuggingActivity not shown in adb...
am aa313948: am d02b00dd: Merge "Fix UsbDebuggingActivity not shown in adb tcpip mode" into jb-mr2-dev
* commit 'aa313948':
Fix UsbDebuggingActivity not shown in adb tcpip mode