tree 887af8a102ee2a9cd679d12eefc2a39f3316aba5
parent 30cd0fc4f66b2ea755d2db39f2a0c42892b3772c
parent 9bc73047b59cdff412cfc647018a69a69d36ae3d
author Todd Poynor <toddpoynor@google.com> 1386283553 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386283553 +0000

am 9bc73047: (-s ours) am 3f17bda8: am a41611f6: healthd: fix botched logging call

* commit '9bc73047b59cdff412cfc647018a69a69d36ae3d':