OSDN Git Service

Merge changes Ic1be7572,Id6481430
authorColin Cross <ccross@android.com>
Fri, 18 Sep 2015 23:33:59 +0000 (23:33 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 18 Sep 2015 23:33:59 +0000 (23:33 +0000)
commit0881ce1817395d62d2746a14350767bf411f89d4
tree8ea79e5141ae5de12233f226628878ad36f95aab
parent9bc462c12a5c4519b00e988b738c029c688c12d5
parentaf6c071a5f5fbb5d8af82884889ca17b59ad41f7
Merge changes Ic1be7572,Id6481430

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