| commit | 611e9449bd737ece4aa7ab71bbc18c813d6798f3 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:52:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:52:56 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 628b0c7435610f166b356b7b19bb86c4ff4629fb [diff] | |
| parent | 8fcba3e260dd8f06f8398eeff1e1d9a4de3aab05 [diff] |
am 56d11898: (-s ours) am 80e83972: am 9537ca80: Merge "adb: start-server and kill-server error output" * commit '56d11898aa6937df3d1342b7d99dca8813d162a4':