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:
561d5aa
2432912
)
Merge "resolved conflicts for merge of f8272896 to master"
author
Elliott Hughes
<enh@google.com>
Thu, 5 Jun 2014 18:40:49 +0000
(18:40 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 5 Jun 2014 18:40:50 +0000
(18:40 +0000)
Trivial merge