tree 9bf2c1f0a57143898e463e2d4f1f0a25a631bf5f
parent 448637498e66a8b5d2914ed0a99238c0a95c1133
parent 67f170993fda3a5b629dc4c55ec52db99176d3df
author Adam Lesinski <adamlesinski@google.com> 1435172147 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435172147 +0000

am 67f17099: Merge "Fix unit issue in Slog.wtf output" into mnc-dev

* commit '67f170993fda3a5b629dc4c55ec52db99176d3df':
  Fix unit issue in Slog.wtf output