tree 5b03439e3f61d519b4394ba06845e60ac7556f20
parent 670ecc22790269b8d8383831fdd5eba3b637675a
parent 9121322ce764744122f1fd3624f8c9d8ad50125f
author Erik Kline <ek@google.com> 1519353971 +0000
committer android-build-merger <android-build-merger@google.com> 1519353971 +0000

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

Change-Id: Ic0293bf12688e785f4942f0985a8470155fe062b