| commit | dfe1e156507edd799b3cedb80978acdcf26922b5 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed Sep 11 18:00:16 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Sep 11 18:00:16 2019 +0000 |
| tree | 19655bc4b3200f3209ad6c0f8f13732c8826fa3a | |
| parent | 54451c0c7b9643d9a21d50a4352985e066914b5e [diff] | |
| parent | f9929cb6e89e5e9d5aeeec4c1a34382d416a1cc0 [diff] |
Merge changes from topic "protobuf-3.9.1" * changes: libjsonpb: fix tests for new protobuf version Adapt to google::protobuf::int64 type change and scoped_ptr removal