OSDN Git Service

Merge changes I2ba90314,I5f47307d am: fc8b331858 am: 8b63d67e1b
authorColin Cross <ccross@android.com>
Wed, 21 Oct 2015 00:34:21 +0000 (00:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Oct 2015 00:34:21 +0000 (00:34 +0000)
am: 5538dc8bfe

* commit '5538dc8bfec3d92be8c982d439488ba44431890f':
  makeparallel: prepend flags to ninja command line
  Put NINJA_ARGS last


Trivial merge