OSDN Git Service

Merge "Allow callers to synchronously block for shutdown"
authorErik Kline <ek@google.com>
Fri, 23 Feb 2018 02:46:11 +0000 (02:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Feb 2018 02:46:11 +0000 (02:46 +0000)
am: 9121322ce7

Change-Id: Ic0293bf12688e785f4942f0985a8470155fe062b


Trivial merge