tree 72fef51f8afd149e4605e60349daa01aa347da3f
parent 6e634fc776e777b33ac3199bc2bbd882fd7e6f36
parent fed67a51dc3b38db4b50a9bc51baea71bfe2cece
author Bertrand Simonnet <bsimonnet@google.com> 1441304043 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441304043 +0000

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

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