tree 0d9f9e7e3b05bcde13ec9bcd0698644ebbf6dea7
parent 3bedd0a674fc14dab3fc444619b5261a81ed97c7
parent 054b0c0e06b1c7b51080dc6223535cf1f6af1f92
author Colin Cross <ccross@android.com> 1541529723 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1541529723 +0000

Merge changes from topic "revert-protobuf3.5.2"

* changes:
  Revert "Adapt to google::protobuf::uint64 type change"
  Revert "Convert statsd_test and statsd_benchmark to proto lite"