OSDN Git Service
(root)
/
android-x86
/
system-extras.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
54451c0
f9929cb
)
Merge changes from topic "protobuf-3.9.1"
author
Colin Cross
<ccross@android.com>
Wed, 11 Sep 2019 18:00:16 +0000
(18:00 +0000)
committer
Gerrit Code Review
<noreply-gerritcodereview@google.com>
Wed, 11 Sep 2019 18:00:16 +0000
(18:00 +0000)
* changes:
libjsonpb: fix tests for new protobuf version
Adapt to google::protobuf::int64 type change and scoped_ptr removal
Trivial merge