am 7d3b4846: am 798219e9: Merge "Fix clang "ueventd.cpp:111:1: error: no return statement in function returning non-void"."

* commit '7d3b4846902dbac3903146638b2eace56d0c7dc3':
  Fix clang "ueventd.cpp:111:1: error: no return statement in function returning non-void".