| commit | cdde45242edbe5bd931233304aa7e71a811a0638 | [log] [tgz] |
|---|---|---|
| author | Jason Simmons <jsimmons@google.com> | Thu Aug 09 13:57:32 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 09 13:57:32 2012 -0700 |
| tree | 6e1ceb114a3d2a839220350d75ec9d467e93d8bd | |
| parent | e0fb9bf241ce2c816b61b00b3b5401982aad5205 [diff] | |
| parent | 845999d232298043c899820c3e9f56e3c00a5845 [diff] |
am 845999d2: Merge "Allow adb to listen both on usb and tcp." into jb-mr1-dev * commit '845999d232298043c899820c3e9f56e3c00a5845': Allow adb to listen both on usb and tcp.