OSDN Git Service

am 0881ce18: Merge changes Ic1be7572,Id6481430
authorColin Cross <ccross@android.com>
Sat, 19 Sep 2015 19:52:44 +0000 (19:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 19 Sep 2015 19:52:44 +0000 (19:52 +0000)
commita084f2c73b905ab4906eb5e7aad593bd6fa222e6
tree0b9ebf7221b2913fdaf3d80666b26a6ea4353876
parent2649e750b6a5a846c8014b0117670f4d15b28684
parent0881ce1817395d62d2746a14350767bf411f89d4
am 0881ce18: Merge changes Ic1be7572,Id6481430

* commit '0881ce1817395d62d2746a14350767bf411f89d4':
  Pass --ninja to makeparallel for ninja
  makeparallel: improve support for wrapping ninja