tree c1ab097639d5bca4bf64ab6c16ae6aef8b41ccdf
parent f7c4c728fcdc4278fc24b5117a5390003690278e
parent fa6bc27df0820a362e0ceae7f9ea73e8a058fe47
author Colin Cross <ccross@android.com> 1541380395 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1541380395 +0000

Merge changes from topic "protobuf3.5.2"

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