tree 6e1ceb114a3d2a839220350d75ec9d467e93d8bd
parent 7c7c1b0d8a09645826e0ee4d8ab30a543c246114
parent 1dd55c53af264b24319d721281fe32c67c053120
author Jason Simmons <jsimmons@google.com> 1344545775 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1344545775 -0700

Merge "Allow adb to listen both on usb and tcp." into jb-mr1-dev