am c097d1f0: (-s ours) am 4f4c7c22: am f8f448b3: Merge "Build with kati+ninja when USE_NINJA=true"

* commit 'c097d1f06e9701d326d693cbfa32ee7f9435f1fb':
This commit is contained in:
Colin Cross 2015-08-27 04:57:57 +00:00 committed by Android Git Automerger
commit e0b98fd823

Diff Content Not Available