| commit | 8736e507bc4194c6067ac7976364d803ce6d74bf | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:35:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:35:16 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 9182c165524545caa21775b224a4011da7daccb0 [diff] | |
| parent | 611e9449bd737ece4aa7ab71bbc18c813d6798f3 [diff] |
am 840a4fe0: am 56d11898: (-s ours) am 80e83972: am 9537ca80: Merge "adb: start-server and kill-server error output" * commit '840a4fe0c79a0af53621e3c81af3b35c9163ddf2':