tree c0fafbbe2c08f161a024ebfe5e865db0b95eabc0
parent 4e4aca72a2428ec2f554a1b343d3329b71548ccf
parent 82a750d29f798a252aa91541ceddfddba1cc772a
author Colin Cross <ccross@android.com> 1568231410 -0700
committer android-build-merger <android-build-merger@google.com> 1568231410 -0700

[automerger skipped] Merge "Adapt to google::protobuf::uint64 type change" am: 05a08644bf am: 19f6a6ce5d am: 1c0df226cf
am: 82a750d29f -s ours
am skip reason: change_id Idb741c8be97df1c752083350fb8fed257903944c with SHA1 b84a4690f5 is in history

Change-Id: Ie0ac4449a9b10e7262c4a92e9c5f01b66a281666