tree e68cd768a43531d639b4e9d8e56d77d7af301ea1
parent 8a5198a1505a4dc7d4722bb58a6eb809b0dd5d2c
parent ed318bff41c4515ca79a11afb97507a452e9fcd3
author Andreas Gampe <agampe@google.com> 1423587210 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423587210 +0000

am ed318bff: Merge "log.h: Fix typo"

* commit 'ed318bff41c4515ca79a11afb97507a452e9fcd3':
  log.h: Fix typo