tree 2ed614246e92edcd0d6e27484f2d1899faab4899
parent bae8b3f2d9442212672105acf30ab4aacfab19fb
parent 15f63e262ea685ff593e5e8c320ab88b0b15d878
author Colin Cross <ccross@android.com> 1460052777 +0000
committer android-build-merger <android-build-merger@google.com> 1460052777 +0000

Merge "makeparallel: reset make\'s unlimited stack" am: a034129
am: 15f63e2

* commit '15f63e262ea685ff593e5e8c320ab88b0b15d878':
  makeparallel: reset make's unlimited stack

Change-Id: Iffb1189b6e883dbe7730cff571fb2836987aa66d