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:
5276762
1f71fb7
)
resolved conflicts for merge of 301b97ac to eclair
author
Dianne Hackborn
<hackbod@google.com>
Thu, 27 Aug 2009 19:26:44 +0000
(12:26 -0700)
committer
Dianne Hackborn
<hackbod@google.com>
Thu, 27 Aug 2009 19:26:44 +0000
(12:26 -0700)
Change-Id: I0fb70cbe0a52006ad14f43a02c30b72aad457c48
Trivial merge