commit | a4fc619868a679c4c081bcb445b5a79c891b80be | [log] [tgz] |
---|---|---|
author | Jerry Zhang <zhangjerry@google.com> | Thu Apr 06 21:28:51 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 06 21:28:51 2017 +0000 |
tree | a941d663ee37191af4f791852a3ab725f7016af9 | |
parent | 735f59e32b04c678a3eca23f95da5a69a70d3ece [diff] | |
parent | aedcedfa859a360091af5ed744677414892139e8 [diff] |
Merge "Wait for threads to finish before returning." into oc-dev am: aedcedfa85 Change-Id: I750feebd454a841877b26771c40d2979f47299ba