| commit | 9287d2d83a420d750e3c1490d52930c11f662a19 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jul 20 17:42:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 17:42:52 2015 +0000 |
| tree | 686090ed59981507fc83a1fa466b1a7f5fc7b4b3 | |
| parent | 3a8a32413615643320bb140a24ab1d77d9aea804 [diff] | |
| parent | 953b44c3ed7b543f5e0c3799f1d37114028be3d2 [diff] |
am 953b44c3: Merge "Fix adbd/adb server confusion in an error message." * commit '953b44c3ed7b543f5e0c3799f1d37114028be3d2': Fix adbd/adb server confusion in an error message.