tree 3292bd06780c67e10ae4c15b78b5a02acf15bf96
parent 46c08db55654e6c36869f7b91390b37b0a7c4c98
parent e0f42b41f629803557cf7706cce8768d54ffdf25
author Colin Cross <ccross@android.com> 1475540919 +0000
committer android-build-merger <android-build-merger@google.com> 1475540919 +0000

Merge "Propagate signals through makeparallel"
am: e0f42b41f6

Change-Id: Ia68f218edd5e57f82bea3269a8fb863077e28082