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:
c05413f
76e8b77
)
resolved conflicts for merge of 1a783be3 to master
author
Jim Miller
<jaggies@google.com>
Fri, 18 Nov 2011 21:56:20 +0000
(13:56 -0800)
committer
Jim Miller
<jaggies@google.com>
Fri, 18 Nov 2011 21:56:20 +0000
(13:56 -0800)
Change-Id: Ibaff3547ac51250fe40adf3aa06d6a30ecfcef54
Trivial merge