OSDN Git Service

resolved conflicts for merge of e0408aa1 to eclair
authorScott Main <smain@google.com>
Fri, 11 Sep 2009 01:08:37 +0000 (18:08 -0700)
committerScott Main <smain@google.com>
Fri, 11 Sep 2009 01:08:37 +0000 (18:08 -0700)
commit1b188d7c9675616a85709674a4eaaa1db325a7ea
tree5a9247f35f2ba7be849680bf24f655f578bc6109
parent1d5ca47adf581f5b7875fb88024300471cccc14a
parent2a3617b0239f6d8ddc8bf915a7aa784f5f8463ff
resolved conflicts for merge of e0408aa1 to eclair