OSDN Git Service

resolved conflicts for merge of b0f5b755 to eclair
authorScott Main <smain@google.com>
Wed, 26 Aug 2009 22:18:14 +0000 (15:18 -0700)
committerScott Main <smain@google.com>
Wed, 26 Aug 2009 22:29:03 +0000 (15:29 -0700)
commit624d35d2541b112cc0f8041c9e3bf0752e7e1210
treeb38dd00e41613f1a80e22d6e403d21b7d6fec136
parent21ee76721fd7f5a10838cfaa9017933aec80e117
parent38b21897231fb49b2754a4a5de8bf40011d566e6
resolved conflicts for merge of b0f5b755 to eclair