tree afca715a410b9361b75776e8e76684dc93501a1e
parent 7aca9310aa4367674ddbf7413f1dc57c807e909a
parent a8b6131ddf5ce6f72115d53c44ac54a44c24ea02
author Mark Salyzyn <salyzyn@google.com> 1433193818 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433193818 +0000

am a8b6131d: Merge "logd: test modernization"

* commit 'a8b6131ddf5ce6f72115d53c44ac54a44c24ea02':
  logd: test modernization