tree 688edd1ac3ee0056ba1bc2c9d3c7ac11f6678f65
parent 2f09a6338184053e02c6ad7248bc1a2751a4e62e
parent d98fe91a7524d40808ae4ed562aeb38e9eedf593
author Colin Cross <ccross@android.com> 1443833462 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443833462 +0000

am d98fe91a: am 6b02b76a: Merge "Fix gcc color diagnostics"

* commit 'd98fe91a7524d40808ae4ed562aeb38e9eedf593':
  Fix gcc color diagnostics