tree 48e47a201825e1cd119013c1a8d940efb3e8793d
parent 54f104e84c956bbbb06adb68c4ffcbadaea47503
parent a49db4d0800e99dca57b4c0367ac4169a2af2df6
author Erik Kline <ek@google.com> 1519354662 +0000
committer android-build-merger <android-build-merger@google.com> 1519354662 +0000

Merge "Allow callers to synchronously block for shutdown" am: 9121322ce7
am: a49db4d080

Change-Id: Icd7df06784a0ecf14c8b9b35d579179ffce65ffc