OSDN Git Service

resolved conflicts for merge of 59a3008a to master
authorJack Palevich <jackpal@google.com>
Thu, 10 Dec 2009 02:12:42 +0000 (10:12 +0800)
committerJack Palevich <jackpal@google.com>
Thu, 10 Dec 2009 02:12:42 +0000 (10:12 +0800)
commitebc03f083027a0ea6261d07307ab80aaa2e0bdb3
tree9437de98b47537ea13f0b680e15dfc2cfe7d8ff4
parent27a0d4372c8378f36dc301193441a21a83d46069
parenta537f08b378616722314a4b1ff560869cc76ff46
resolved conflicts for merge of 59a3008a to master