tree 2710617775b7af1c1ed82192288ee6689de0dbd2
parent fdf93c06317f6d63e72aa1105777a248b9679e84
parent e70851f8a8aa4c9dfaa442abf812c283ba8d8b6f
author Mark Salyzyn <salyzyn@google.com> 1410552527 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410552527 +0000

am e70851f8: am f9b9693b: Merge "liblog: logcat: colored output."

* commit 'e70851f8a8aa4c9dfaa442abf812c283ba8d8b6f':
  liblog: logcat: colored output.