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)
* commit '0881ce1817395d62d2746a14350767bf411f89d4':
  Pass --ninja to makeparallel for ninja
  makeparallel: improve support for wrapping ninja


Trivial merge