tree a66daea242d2f402d582581de737e14ac9db1bb6
parent bd80e0d8e6de5c2d4fbd2e8a1bc750dc6e0b7e20
parent 9e7bef0ef91e819a11ceb8b14489cb451970e62e
author Mark Salyzyn <salyzyn@google.com> 1403118963 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403118963 +0000

am 9e7bef0e: Merge changes I759c65e8,I97699037

* commit '9e7bef0ef91e819a11ceb8b14489cb451970e62e':
  logd: test: deal with spam filter turned off
  logd: test: modernize