OSDN Git Service

Merge changes from topic "protobuf-3.9.1"
authorColin Cross <ccross@android.com>
Wed, 11 Sep 2019 18:00:16 +0000 (18:00 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 11 Sep 2019 18:00:16 +0000 (18:00 +0000)
commitdfe1e156507edd799b3cedb80978acdcf26922b5
tree19655bc4b3200f3209ad6c0f8f13732c8826fa3a
parent54451c0c7b9643d9a21d50a4352985e066914b5e
parentf9929cb6e89e5e9d5aeeec4c1a34382d416a1cc0
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