OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
86d5cee
5603341
)
Merge "resolve merge conflicts of 9795ff6 to master"
author
TreeHugger Robot
<treehugger-gerrit@google.com>
Thu, 22 Sep 2016 22:49:34 +0000
(22:49 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 22 Sep 2016 22:49:35 +0000
(22:49 +0000)
Trivial merge