tree a6c608e0e1d1c37c25a4cadb21436b55ffdb2376
parent abc3d43a9da698c5362eb0cb1eb594e241e1884d
parent 10a124d342530b4c366f08d3a899474c4e5eb7fc
author Mark Salyzyn <salyzyn@google.com> 1433193817 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433193817 +0000

am 10a124d3: Merge "logd: whitelist should not preserve expire messages"

* commit '10a124d342530b4c366f08d3a899474c4e5eb7fc':
  logd: whitelist should not preserve expire messages