tree 8ea79e5141ae5de12233f226628878ad36f95aab
parent 9bc462c12a5c4519b00e988b738c029c688c12d5
parent af6c071a5f5fbb5d8af82884889ca17b59ad41f7
author Colin Cross <ccross@android.com> 1442619239 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1442619239 +0000

Merge changes Ic1be7572,Id6481430

* changes:
  Pass --ninja to makeparallel for ninja
  makeparallel: improve support for wrapping ninja