tree c6c69c6bb96abd22da66d8de774954dc3a097ac3
parent 54a7ab498c8e1165456b4941473702ae8533162c
parent 41e15446603950f74fd9e0a2c9e6565d0d5b18b1
author Yifan Hong <elsk@google.com> 1533253945 -0700
committer android-build-merger <android-build-merger@google.com> 1533253945 -0700

Merge "lshal: close fd before joining thread" am: 16b9f38d22 am: e13b6b62e6
am: 41e1544660

Change-Id: I052e7988c857de51e273af44f716d347813c8073