tree 741421536671d13e5bdb02d01e51d869a7a02959
parent b19825012eb159ad459c7c690b8ed7f7b4653c9c
parent 59cebb6e6f3e9786b38e2622dfdf653f7c5ec80f
author Keun-young Park <keunyoung@google.com> 1490654103 +0000
committer android-build-merger <android-build-merger@google.com> 1490654103 +0000

Merge "update shutdown sequence and use shutdown_timeout to cover all wait"
am: 59cebb6e6f

Change-Id: I4a09594aba83bc489c9e1735b27e4dbdf5256385