tree c1fab2ef18e685f2df7e3de9b67d20ad035a9d43
parent 777b9bdd392166ff96cc680de56bee062076239b
parent 9287d2d83a420d750e3c1490d52930c11f662a19
author Elliott Hughes <enh@google.com> 1437416334 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437416334 +0000

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.