commit | 54163af616f8cc5d1efa20385cfdff3fdb065eb5 | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Tue Nov 06 11:11:37 2018 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Tue Nov 06 11:11:37 2018 -0800 |
tree | 9f5299d463b89a84e1af1a2bf73f440054da0db6 | |
parent | acc9d5b878c452013d1ebddcf5c6989da7aa27f7 [diff] | |
parent | 435f7eda69b86eb481b6f676b1a6e8332474d804 [diff] |
Merge "Revert "Adapt to google::protobuf::uint64 type change"" am: 4d16ee4f10 am: 435f7eda69 Change-Id: Ic68743522e67b8638481b1e4398a1fc19eb71d5b