tree c8f41c882b0d6b82c029a2a7df0066d4d6b5b1cf
parent 4dc986293e40aa56361c2f8c1b0f2f22b739c109
parent 4bde5520278a9c489a710246b7dc24ccb07ffc93
author Mark Salyzyn <salyzyn@google.com> 1428935477 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428935477 +0000

am 3c5e3a82: am 8913dec5: Merge changes Iddd45a67,Ifdc20b09,Ibc68480d

* commit '3c5e3a8251615c857804d4f39e54d1ee263983f9':
  logd: disable worst uid prune for events buffer
  Revert: "logd: default off by-UID spam filter"
  logd: annotate worst-UID pruned entries