tree 290778bbdedb6f8fc4c1cc3ff245c047266f39ed
parent d963884232959c2de9b7b149530cbfea26fad6dc
parent c08ede8089d06aae88f054fd9168490937854cf3
author Treehugger Robot <treehugger-gerrit@google.com> 1537887273 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1537887273 +0000

Merge "Make watchdog_noop inline to fix Mac build"