| commit | 68870eb271a659ec723af62b76a694b1e1e4b71d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:27:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:27:04 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 5e1816ace1906de5f3e76561d0a47153e27b6741 [diff] | |
| parent | 6c216bd34308707083aaaaece500d43a335ab103 [diff] |
am 68b452b9: am 0f9b94e2: (-s ours) am 9287d2d8: am 953b44c3: Merge "Fix adbd/adb server confusion in an error message." * commit '68b452b9ef38f7c0fb4c15d1b4efefa43d56d57a':