commit | c9055b637ceb8e12edc2282ea5049fc0bca6b10a | [log] [tgz] |
---|---|---|
author | Erik Kline <ek@google.com> | Fri Feb 23 03:08:02 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 23 03:08:02 2018 +0000 |
tree | d580f1b64461b0c0a3988247f5788a911b411705 | |
parent | acb42c36f5ecfa2ab442fce1b97ab446c73008a8 [diff] | |
parent | d389a223919646eb737339fa4a4669cf7b11f3d1 [diff] |
Merge "Allow callers to synchronously block for shutdown" am: 9121322ce7 am: a49db4d080 am: d389a22391 Change-Id: Idf60c16ac8003503f33130ddc6276a17fed75108