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:
f1e8976
1214db9
)
resolved conflicts for merge of 31796297 to master
author
Daniel Sandler
<dsandler@google.com>
Mon, 7 Feb 2011 21:12:16 +0000
(16:12 -0500)
committer
Daniel Sandler
<dsandler@google.com>
Mon, 7 Feb 2011 21:12:16 +0000
(16:12 -0500)
Change-Id: Ice632b3378f8f67c186245fdb63b022ade864ba1
Trivial merge