tree 1cb314bb2f2c9bf33f11866b820e075c86888f9c
parent 65fd5412d7fe053cb28f8e39e7753d86c333be22
parent 174f30b170693054abec89178e3ac7096a3cc06f
author Mark Salyzyn <salyzyn@google.com> 1399071496 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399071496 +0000

am 174f30b1: am dc57f4d9: Merge "logd: build breakage in git_master-nova @ 1151709"

* commit '174f30b170693054abec89178e3ac7096a3cc06f':
  logd: build breakage in git_master-nova @ 1151709