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:
9dddc98
e9bef14
)
resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
author
repo sync
<andih@google.com>
Tue, 11 Jan 2011 23:26:51 +0000
(15:26 -0800)
committer
repo sync
<andih@google.com>
Tue, 11 Jan 2011 23:26:51 +0000
(15:26 -0800)
Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26
Trivial merge