tree be7b8cfd4dbb2cb152e78b8ee4874da8e87300f3
parent b49dd83efcf953dc99046470e9340f7876ef5764
parent 53ebeef0fb82fc223d03fac27ce25c1d6efa1c87
author Josh Gao <jmgao@google.com> 1484784200 +0000
committer android-build-merger <android-build-merger@google.com> 1484784200 +0000

Merge changes from topic 'kill_debuggerd' am: cfb19e3ac8 am: fe6eb8761d
am: 53ebeef0fb

Change-Id: Id08e306054078cd7e2252c3e004334bfc224722f