OSDN Git Service

Merge "exec makeparallel" am: cf8afef2eb am: 46c08db556
authorColin Cross <ccross@android.com>
Tue, 4 Oct 2016 00:34:30 +0000 (00:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Oct 2016 00:34:30 +0000 (00:34 +0000)
am: 74e1ccf614

Change-Id: I3fc58de48d785c5d222003ef4f4a12307a149efc


Trivial merge