tree 9da1007a80695037dace3f36b678956631825aec
parent 6df12a5d42f8e69f45ca2e606624b1aac097ffb7
parent dab530b26597a8d312d74815d581f22aaed399e4
author Mark Salyzyn <salyzyn@google.com> 1441139490 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441139490 +0000

am 3f5c5a1e: Merge "logd: worst uid record watermark part three" into mnc-dr-dev

* commit '3f5c5a1e6986a7cdafc4af10f17ddd631da83e40':
  logd: worst uid record watermark part three