tree a7655df65be114898a4afa932d0bda2e12eae47d
parent e1ca19b599fc7b538eda86d398081c56e9e81c68
parent 827f64625ed03d69543953f48a39e70b85ee3255
author Bertrand Simonnet <bsimonnet@google.com> 1441240777 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441240777 +0000

am 827f6462: am 74f6f8c3: Merge "metricsd: Make the unit tests pass."

* commit '827f64625ed03d69543953f48a39e70b85ee3255':
  metricsd: Make the unit tests pass.