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:
895c646
0c872c2
)
Merge changes from topic "protobuf-3.9.1"
author
Colin Cross
<ccross@android.com>
Fri, 6 Sep 2019 18:01:09 +0000
(18:01 +0000)
committer
Android (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