tree c56426935630c263e792b1f7c0e19c3346ee3280
parent e84a027259e7ba2c4dfbc3693c59c2f0939f9f81
parent fe6eb8761d33d33fac7f5278ea2ee7fff01531da
author Josh Gao <jmgao@google.com> 1484783754 +0000
committer android-build-merger <android-build-merger@google.com> 1484783754 +0000

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

Change-Id: Ia02b6894b0a6d92fa7c6c9c3af6ba22fd1995930