tree 79b703974c88a4ffba5452c4354910bdbde809f4
parent e1b3686faa379671111ce284a5001dc24d603dd1
parent 872fd513979491854742efc213367963f7c240e4
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1541533354 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1541533354 +0000

Merge changes from topic "am-4601e3b1584e408da71c5f4ed61d7df2"

* changes:
  Merge changes from topic "revert-protobuf3.5.2" am: a4680e1ebe am: 3e312d20cd am: e217b6222c
  Revert "Convert statsd_test and statsd_benchmark to proto lite" am: 47046b80d2 am: 65200cf70e am: bd7c4efbb6