tree b6001c59a3908a1b203675a8487364ac0cda7b38
parent 6c34c5da4921c21e645b657cf1d48b0a208621c4
parent 3e1f5ba67e0f2403da9278a6226e9f8979f975b7
author Mark Salyzyn <salyzyn@google.com> 1395698770 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395698770 +0000

am 3e1f5ba6: am c66607a8: Merge "logd: compile warning message"

* commit '3e1f5ba67e0f2403da9278a6226e9f8979f975b7':
  logd: compile warning message