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:
a7d6b7e
5184bce
)
resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp
author
Robert Greenwalt
<rgreenwalt@google.com>
Sat, 29 Jan 2011 17:32:04 +0000
(09:32 -0800)
committer
Robert Greenwalt
<rgreenwalt@google.com>
Sat, 29 Jan 2011 17:32:04 +0000
(09:32 -0800)
Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963
Trivial merge