tree d580f1b64461b0c0a3988247f5788a911b411705
parent acb42c36f5ecfa2ab442fce1b97ab446c73008a8
parent d389a223919646eb737339fa4a4669cf7b11f3d1
author Erik Kline <ek@google.com> 1519355282 +0000
committer android-build-merger <android-build-merger@google.com> 1519355282 +0000

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

Change-Id: Idf60c16ac8003503f33130ddc6276a17fed75108