tree c96ac0995df7f6c300f2a2b7540b4bf6253a6a7e
parent 5567c30f4efd330b8882043ca452699ac02385a6
parent 2e8720d2bf64c07532c6e553df71843d4b42e634
author Bertrand Simonnet <bsimonnet@google.com> 1442256584 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442256584 +0000

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

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