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:
eb25a94
5865053
)
resolved conflicts for merge of 97ac2935 to honeycomb-plus-aosp
author
Nick Pelly
<npelly@google.com>
Fri, 21 Jan 2011 17:41:40 +0000
(09:41 -0800)
committer
Nick Pelly
<npelly@google.com>
Fri, 21 Jan 2011 17:41:40 +0000
(09:41 -0800)
Change-Id: I5b510a3598adf17b738ecfe6bf8fbc47f7111350
Trivial merge