| commit | 7cd970f70326b073c5bf09d7fc26532809a7cd32 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jul 20 18:18:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 18:18:54 2015 +0000 |
| tree | c1fab2ef18e685f2df7e3de9b67d20ad035a9d43 | |
| parent | 800effcb693c493204506d78c4a9a23f2a1fb924 [diff] | |
| parent | 8b4a973a4ad06499605397fb792c24291e22a848 [diff] |
am 9287d2d8: am 953b44c3: Merge "Fix adbd/adb server confusion in an error message." * commit '9287d2d83a420d750e3c1490d52930c11f662a19': Fix adbd/adb server confusion in an error message.