tree dc1a01ccf60609da63ded896b5fb2cbc2f1448d8
parent c2c183774d48b81f8f957eb75770b2acec7b0eaf
parent f32280abd8739bcd44be40b1cb21e369d92ea9af
author Bertrand Simonnet <bsimonnet@google.com> 1441301934 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441301934 +0000

am c1862479: Merge "metricsd: Collect generic stats about the system."

* commit 'c18624799b0dd832c0dd1f70455dd5912605291b':
  metricsd: Collect generic stats about the system.