commit | 0f9b94e21d6db64abaf026e84b544d32364f99bf | [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 | cca5c3f1723e414b5e1b69b01f2d8ba7a5ed75fa [diff] | |
parent | 9287d2d83a420d750e3c1490d52930c11f662a19 [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.