OSDN Git Service

Merge changes I2ba90314,I5f47307d am: fc8b331858
authorColin Cross <ccross@android.com>
Wed, 21 Oct 2015 00:26:52 +0000 (00:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Oct 2015 00:26:52 +0000 (00:26 +0000)
commit5538dc8bfec3d92be8c982d439488ba44431890f
tree7ce716da0b184416ded467448d3389b8e4c199e5
parent92a73a0f6c0c768d4bc612106e0c6ddcb7fb2846
parent8b63d67e1ba42d090e19cae32e802117b9cac852
Merge changes I2ba90314,I5f47307d am: fc8b331858
am: 8b63d67e1b

* commit '8b63d67e1ba42d090e19cae32e802117b9cac852':
  makeparallel: prepend flags to ninja command line
  Put NINJA_ARGS last