OSDN Git Service

Merge "Convert -j to a reasonable parallelism for kati" am: bb5c13d359 am: 57de869060
authorColin Cross <ccross@android.com>
Thu, 19 Jan 2017 00:15:57 +0000 (00:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Jan 2017 00:15:57 +0000 (00:15 +0000)
am: 8b8c5d98f1

Change-Id: I94f427a5830c5400c0ad96b73b59210ebb845d7b


Trivial merge