OSDN Git Service

am 9bc73047: (-s ours) am 3f17bda8: am a41611f6: healthd: fix botched logging call
authorTodd Poynor <toddpoynor@google.com>
Thu, 5 Dec 2013 22:45:53 +0000 (22:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 22:45:53 +0000 (22:45 +0000)
* commit '9bc73047b59cdff412cfc647018a69a69d36ae3d':


Trivial merge