| commit | d208f8353dd2960c78fc9f5b9fb9aef8afacde31 | [log] [tgz] |
|---|---|---|
| author | Jason Simmons <jsimmons@google.com> | Thu Aug 09 13:59:55 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 09 13:59:55 2012 -0700 |
| tree | 4476396a595841ace69fc3303c80bb17b020ebc0 | |
| parent | 8f8f94015d5024027d36612822339967957bcde6 [diff] | |
| parent | cdde45242edbe5bd931233304aa7e71a811a0638 [diff] |
am cdde4524: am 845999d2: Merge "Allow adb to listen both on usb and tcp." into jb-mr1-dev * commit 'cdde45242edbe5bd931233304aa7e71a811a0638': Allow adb to listen both on usb and tcp.