tree 686090ed59981507fc83a1fa466b1a7f5fc7b4b3
parent 0d63afe09def47a794db5e8d4b2d63193763c966
parent 6f3ef3550de1073563245728a10a6e353fbf78f5
author Elliott Hughes <enh@google.com> 1437413114 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1437413116 +0000

Merge "Fix adbd/adb server confusion in an error message."