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:
ef6a8ae
9358d98
)
resolved conflicts for merge of 9358d98d to master
author
Svetoslav
<svetoslavganov@google.com>
Thu, 14 Nov 2013 02:43:32 +0000
(18:43 -0800)
committer
Svetoslav
<svetoslavganov@google.com>
Thu, 14 Nov 2013 02:43:32 +0000
(18:43 -0800)
Change-Id: I1facdcec6eeaa10805300c9d634957fbb86815d3
Trivial merge