tree f08f0e566e86e563b9fa94f53caa7dd973d29aee
parent 12b88ecd21667999a0b430533baad1c2f559295c
parent dc15ffd2208ec6144ace4754aa4687d40d62b3cc
author Dan Albert <danalbert@google.com> 1430356739 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430356739 +0000

am e433adb7: am 9616e829: Merge "Support base::logging on Windows."

* commit 'e433adb71673d18a2e8272ec0a7bb6bb87f6fd6b':
  Support base::logging on Windows.