tree 293df692fb3d281ed75926a83c7e452ce216a29f
parent 44a7da74bd841eee680870433c1baf82325fb51e
parent 07ee12aafc9ed0cbadbfa3c29a31c9854e07b4b9
author Mark Salyzyn <salyzyn@google.com> 1440092465 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440092465 +0000

am 07ee12aa: Merge "logd: worst uid record watermark"

* commit '07ee12aafc9ed0cbadbfa3c29a31c9854e07b4b9':
  logd: worst uid record watermark