tree a71287364e954443f8755db02c401234ff7b1899
parent 473279bbd9b9c6ece4111f9371d3069876cfe53a
parent 280f4eb016f9d1a0c0aba590c7bc3ebeaf364743
author Josh Gao <jmgao@google.com> 1484787193 +0000
committer android-build-merger <android-build-merger@google.com> 1484787193 +0000

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

Change-Id: I83a19282b24b0140f9c666779a7f8fb7fcf5ae2b