| commit | 2fa731ee6ea387aee2175768c050afe6c2d0afad | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:27:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:27:30 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 09ba12677837bc6a41424e09e88365e17ee6a72d [diff] | |
| parent | 09da526673ec0dc8ab608a01b70ac4a649d27ec1 [diff] |
am c8e195d6: am ac6a325e: (-s ours) am b02de7ed: am 05418442: Merge "Remove subproc events when ADB_HOST." * commit 'c8e195d6729cab43bb5996698f7cf317f5aaf155':