tree b2358e0b91cccb32ecbc764aa8887d1de3013006
parent 3b1cfb1d8fdb7310adfe98cbfb568926eb939358
parent 88b927e258214a31342326d46f527528e5979f85
author vandwalle <vandwalle@google.com> 1412437535 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412437535 +0000

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

* commit '88b927e258214a31342326d46f527528e5979f85':
  add millisecond timestamp to locallog