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:
0b77ea2
8ab0c00
)
Merge "resolved conflicts for merge of cfeaa492 to master"
author
Daniel Sandler
<dsandler@google.com>
Tue, 1 Mar 2011 02:38:02 +0000
(18:38 -0800)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 1 Mar 2011 02:38:02 +0000
(18:38 -0800)
Trivial merge