am 03cf7f79: resolved conflicts for merge of 166cfe68 to lmp-dev-plus-aosp

* commit '03cf7f79dcd9900e4178144e440c334ff45b14e3':
  Added default constructor for log_t.