| commit | f8d0c1df4c07ef20cbfcd4fdcb7dabff2977babb | [log] [tgz] |
|---|---|---|
| author | David Pursell <dpursell@google.com> | Tue Jun 07 04:45:46 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 07 04:45:46 2016 +0000 |
| tree | 73019a05675b842f51e4c6bcc16541e804f34315 | |
| parent | c6aa3e575fd49b96c72883871d3ee816b438f2bc [diff] | |
| parent | e89c04bbef7e7d953840c1e654d4bd21bc0bdf6f [diff] |
Merge "resolve merge conflicts of f6d0da2 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am: 3b2920a807 * commit '3b2920a8078a5bbd20054477060077082e0e4d1a': adbd: properly close subprocess pipes on Ctrl+C. Change-Id: I794ed483e5b7b983f4643e6e46e6632001bc6d41