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:
282cdfb
e7afca1
)
resolved conflicts for merge of 74af525e to master
author
Wink Saville
<wink@google.com>
Fri, 13 May 2011 21:01:16 +0000
(14:01 -0700)
committer
Wink Saville
<wink@google.com>
Fri, 13 May 2011 21:01:16 +0000
(14:01 -0700)
Change-Id: I60a6d7ecd1809dd13b1ca791baff52d82d846f2d
Trivial merge