commit | d389a223919646eb737339fa4a4669cf7b11f3d1 | [log] [tgz] |
---|---|---|
author | Erik Kline <ek@google.com> | Fri Feb 23 02:57:42 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 23 02:57:42 2018 +0000 |
tree | 48e47a201825e1cd119013c1a8d940efb3e8793d | |
parent | 54f104e84c956bbbb06adb68c4ffcbadaea47503 [diff] | |
parent | a49db4d0800e99dca57b4c0367ac4169a2af2df6 [diff] |
Merge "Allow callers to synchronously block for shutdown" am: 9121322ce7 am: a49db4d080 Change-Id: Icd7df06784a0ecf14c8b9b35d579179ffce65ffc