tree 3d83af5ab5a65363bd3467d7ce43456d5670aaec
parent 917041aa10ad15f58501c8c1dd848db4c2ae0d5c
parent 5e349ea3f6693a76d6543197dd9061f679fa4f81
author Colin Cross <ccross@android.com> 1541383485 -0800
committer android-build-merger <android-build-merger@google.com> 1541383485 -0800

Merge "Adapt to google::protobuf::uint64 type change" am: b8fd364d0a
am: 5e349ea3f6

Change-Id: I0781d141b1ab2d6ff268bfec0c1915a3bda66eac