| commit | 96be1844b925e164945caeddc6dace6842f20fe6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:51:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:51:32 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 7062f9ae500116e3d24fd0e15ae4fe836c65e256 [diff] | |
| parent | 71ded02faedd2be113f693c2305db5f4bd32a4d9 [diff] |
am 184585c4: (-s ours) am af60acef: am 98714882: Merge "adb start-server: Use a separate fd for sending initial OK" * commit '184585c417a4411b18ba41d938501ab3f5b25267':