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:
e3db675
0ee0b92
)
resolved conflicts for merge of 1d0d1188 to master
author
Nick Pelly
<npelly@google.com>
Mon, 13 Dec 2010 20:22:34 +0000
(12:22 -0800)
committer
Nick Pelly
<npelly@google.com>
Mon, 13 Dec 2010 20:22:34 +0000
(12:22 -0800)
Change-Id: I80413d5a54a0284ab6f685c4c6197a2c009ea717
Trivial merge