tree a2dba88fb814a4a08eccf81a45c16afa8ea52adf
parent 3c7e341f576172ae5f8c2178fb12d86806a7c774
parent c08e57ce4d7777181c373bf3b6d6df3df17388be
author Dan Willemsen <dwillemsen@google.com> 1487734407 +0000
committer android-build-merger <android-build-merger@google.com> 1487734407 +0000

Merge "Wait for children to exit in makeparallel" am: 9b1a185029
am: c08e57ce4d

Change-Id: I2bc1fe1b9834ab56575db0c2e6fa96b968550382