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:
7f5b06e
520e598
)
resolved conflicts for merge of fb729202 to master
author
Gilles Debunne
<debunne@google.com>
Tue, 6 Dec 2011 23:57:47 +0000
(15:57 -0800)
committer
Gilles Debunne
<debunne@google.com>
Tue, 6 Dec 2011 23:57:47 +0000
(15:57 -0800)
Change-Id: Ic571594b14f2822094d5c1aa4c4b1e9da4a2eae0
Trivial merge