tree 7495cac95a16b08b545541346c9bf4e8b17896c4
parent 03802377df83f3c4948a35117a3a75f6738aab2c
parent d04de525609a03a2c7aca0255ee7ca3428d004e8
author Dan Willemsen <dwillemsen@google.com> 1487734736 +0000
committer android-build-merger <android-build-merger@google.com> 1487734736 +0000

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

Change-Id: Ia6c4cb26f2d5d8c485f1139ac128e7482b6235a0