OSDN Git Service

Merge changes from topic "protobuf-3.9.1"
authorColin Cross <ccross@android.com>
Fri, 6 Sep 2019 18:01:09 +0000 (18:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 6 Sep 2019 18:01:09 +0000 (18:01 +0000)
* changes:
  libjsonpb: fix tests for new protobuf version
  Adapt to google::protobuf::int64 type change and scoped_ptr removal


Trivial merge