tree d4c5960fe77cbe88d98f8499fed434726907178f
parent 49eaf444a4f39e4738c3250abe4253be5231f089
parent 187113c82890f98206218a0a5dc45bf4da58a5fb
author Mark Salyzyn <salyzyn@google.com> 1428944759 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428944759 +0000

am 7746546b: Merge "logcat: build regression"

* commit '7746546b89bf2da44eb058a4053dd4505d00d824':
  logcat: build regression