| commit | ed169f6e492f7ad035e2a6056edd4e303e7aa4a6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jul 20 18:18:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 18:18:53 2015 +0000 |
| tree | e45d7203b9a7fc7c1ca35d7056ecbfab2c9ee339 | |
| parent | 8de1ee1451e4a82065a4c88f2d7f71f041db09ea [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.