tree 7f8272f4c2c11a8c62749cd12b25ee1d71cfe1a7
parent d178711933b9dfc232060cf21e3f572eaeca3c10
parent e69eaddc3e1ac03bc6303f58b4be7fe4b92ddeb0
author Yifan Hong <elsk@google.com> 1494639531 +0000
committer android-build-merger <android-build-merger@google.com> 1494639531 +0000

Merge "Actually remove dead processes from lshal" am: 28765c6184 am: d52b085d44
am: e69eaddc3e

Change-Id: I120912d0dd12dec09d531a96111080c6f8a14b92