tree 4131f17704c34f547c9a7a3797bc465e54785da7
parent 69a0a780fcd33335d479f054f10355f2cc913f99
parent 86a7170f1e0c73e9082db3e9e8e3ed97ac876525
author Elliott Hughes <enh@google.com> 1437446103 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437446103 +0000

am b02de7ed: am 05418442: Merge "Remove subproc events when ADB_HOST."

* commit 'b02de7eda1d84179bc6d0f898a4b6e3d0565834b':
  Remove subproc events when ADB_HOST.