| commit | 6d416684b5ec2ab42f1fd3fed70f7e5786d9dbc0 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jul 20 18:18:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 18:18:54 2015 +0000 |
| tree | c1fab2ef18e685f2df7e3de9b67d20ad035a9d43 | |
| parent | 777b9bdd392166ff96cc680de56bee062076239b [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.