commit | 3c86cc4bc8cf87df3eda9de21d4967554b2a4ffb | [log] [tgz] |
---|---|---|
author | Keun-young Park <keunyoung@google.com> | Mon Mar 27 22:39:25 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Mar 27 22:39:25 2017 +0000 |
tree | 741421536671d13e5bdb02d01e51d869a7a02959 | |
parent | cf4fdc1c6af78e214bea6b705b917d81f1b7d12c [diff] | |
parent | bfb9bea368374a256e90567cf265e2035213a2c6 [diff] |
Merge "update shutdown sequence and use shutdown_timeout to cover all wait" am: 59cebb6e6f am: bfb9bea368 Change-Id: I35d70a225670c1946e0a705e174c856ebe67ba7a