| commit | 8b4a973a4ad06499605397fb792c24291e22a848 | [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 | 05edbe667d1b32444255c22f74170e1b3325a2da [diff] | |
| parent | 666a15d1f0d30514210340e97d6de4b7967fa1c7 [diff] |
am 953b44c3: Merge "Fix adbd/adb server confusion in an error message." * commit '953b44c3ed7b543f5e0c3799f1d37114028be3d2': Fix adbd/adb server confusion in an error message.