tree bcf299f28d9394512bbcb3ff5fe964d965ea9a68
parent acd574c1a7f3e8e79ab14aef942b896019349798
parent fba413d831766c3ed871b9787f60d9111045b36f
author Mark Salyzyn <salyzyn@google.com> 1433193815 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433193815 +0000

am fba413d8: Merge changes I04fad67e,I5ab24bc7

* commit 'fba413d831766c3ed871b9787f60d9111045b36f':
  logd: KISS & fix preserve a day
  logd: deal with sloppy leading expire messages