am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev

* commit '4f5fd78019bda5582f652393fdc3c83f45100bf1':
  add millisecond timestamp to locallog