| commit | 6c216bd34308707083aaaaece500d43a335ab103 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:40:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:40:45 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | e7f685d9ed3c0305cfb8a620dabd31e7adbeb4e4 [diff] | |
| parent | ed169f6e492f7ad035e2a6056edd4e303e7aa4a6 [diff] |
am 0f9b94e2: (-s ours) am 9287d2d8: am 953b44c3: Merge "Fix adbd/adb server confusion in an error message." * commit '0f9b94e21d6db64abaf026e84b544d32364f99bf':