| commit | b7b230a5218d7cdf996203caba9f5cb635ef0fc8 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:33:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:33:05 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | ec154dc63a61f2c8708da129c0447f23de3c80e8 [diff] | |
| parent | 96be1844b925e164945caeddc6dace6842f20fe6 [diff] |
am 4f145188: am 184585c4: (-s ours) am af60acef: am 98714882: Merge "adb start-server: Use a separate fd for sending initial OK" * commit '4f145188afd2f2a45904675456a38bebbcf89fb4':