| commit | 6d263866abead40392c201d09ae07ca2e8fce915 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jul 20 18:43:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 18:43:02 2015 +0000 |
| tree | 644ae8bc85123199bdb95a66622c2a976b11575c | |
| parent | 02fe1e871e501a13fb58431d5375e32d988f8d50 [diff] | |
| parent | 7cd970f70326b073c5bf09d7fc26532809a7cd32 [diff] |
am 6d416684: am 9287d2d8: am 953b44c3: Merge "Fix adbd/adb server confusion in an error message." * commit '6d416684b5ec2ab42f1fd3fed70f7e5786d9dbc0': Fix adbd/adb server confusion in an error message.