am 1763d1aa: (-s ours) am e49aba54: am 95e7cb5b: Merge "healthd: logd: add timestamp to kernel logged battery messages"

* commit '1763d1aa786ad4df97eeeb0c1fc482b8b29eb2de':