am 982bbea0: (-s ours) am 2a04ec35: am 07ee12aa: Merge "logd: worst uid record watermark"

* commit '982bbea061918bd0146ceecf85daccfbcafea8e7':
This commit is contained in:
Mark Salyzyn 2015-08-27 11:54:26 +00:00 committed by Android Git Automerger
commit 4dfd9c169a

Diff content is not available