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:
35b4ca1
27abf05
)
resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp
author
Robert Greenwalt
<rgreenwalt@google.com>
Fri, 28 Jan 2011 17:06:30 +0000
(09:06 -0800)
committer
Robert Greenwalt
<rgreenwalt@google.com>
Fri, 28 Jan 2011 17:06:30 +0000
(09:06 -0800)
Change-Id: Ib9d24c211461329955288180978a7c5d383bba75
Trivial merge