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:
3b0e7f8
64bc0f2
)
resolved conflicts for merge of 99cd6671 to master
author
Wink Saville
<wink@google.com>
Tue, 12 Jul 2011 20:56:05 +0000
(13:56 -0700)
committer
Wink Saville
<wink@google.com>
Tue, 12 Jul 2011 20:56:05 +0000
(13:56 -0700)
Change-Id: I81ac18b1b8291a96bdfa3386f2fe3633fd7eeb79
Trivial merge