commit | d2b4b770948cf49fafba7205805ab7f43e710356 | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Tue Nov 06 11:29:12 2018 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Tue Nov 06 11:29:12 2018 -0800 |
tree | b4cf0f2c1fc0e9cce1ba085d389f280771ad2298 | |
parent | 69985f830f322ef33cf0b947a2fe09ec04d34de2 [diff] | |
parent | 54163af616f8cc5d1efa20385cfdff3fdb065eb5 [diff] |
Merge "Revert "Adapt to google::protobuf::uint64 type change"" am: 4d16ee4f10 am: 435f7eda69 am: 54163af616 Change-Id: Ic1589a6f6a4ad093c44028815a846b6ab0912c53