tree 15b4264448e870922e667776282de66827539950
parent 6de70784ef5bdc6bf495fa86eda68deb16ef2f9e
parent 76ed92c3c6882af801f8454a1dd9bf8e3a908ba2
author Mark Salyzyn <salyzyn@google.com> 1429564840 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429564840 +0000

am 76ed92c3: Merge "logd: better drop message merging"

* commit '76ed92c3c6882af801f8454a1dd9bf8e3a908ba2':
  logd: better drop message merging