tree e508850959293d72a89041aac4bb7040971120ab
parent cdc8d8b52fd0ef8269ab08a2888beaf9d477bbe0
parent 195cda917e27e77a67be6214d4f4dbd65890aa0d
author Bill Yi <byi@google.com> 1438102771 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438102771 +0000

am 4c0ebdf2: am 15b8a778: Merge branch \'rewrite-metrics\' into merge-metrics

* commit '4c0ebdf2ed3ae5ea61887c5ef97efc363b85d3ad': (200 commits)
  metrics: Import protobufs from Chromium.
  metrics: replace "Logging.*" with "Platform.*"
  platform2: Fix issues with new version of libchrome
  init: fix typo and prevent startup error
  metrics: Add a check for abnormally small messages to prevent crashes
  libchromeos: Switch http Response to use streams
  Revert "metrics: Fix the import path of protobufs."
  metrics: Fix the import path of protobufs.
  platform2: Switch over to libchrome r323904
  metrics: add TPM.EarlyResetDuringCommand CrOS event.
  delete __STDC_{FORMAT,LIMIT}_MACROS
  metrics: make metrics library also use /var/lib/metrics/uma-events
  metrics: tell what file we can't open on error
  metrics: move sample file from /var/run to /var/lib
  metrics: don't upload metrics when metrics are disabled
  metrics: Disable uploader on non-official build.
  platform2: Switch over to using base64 functions from libchromeos
  metrics: fix -Winconsistent-missing-override warning
  metrics: Fix upload_service to work with base::MessageLoop
  metrics: generate app_version from standard lsb-release fields
  ...