OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
584c429
e886ad2
)
Merge "resolve merge conflicts of cdbdd46 to master"
author
TreeHugger Robot
<treehugger-gerrit@google.com>
Fri, 12 Aug 2016 17:22:02 +0000
(17:22 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 12 Aug 2016 17:22:03 +0000
(17:22 +0000)
Trivial merge