OSDN Git Service

resolved conflicts for merge of 494d8698 to master
authorYing Wang <wangying@google.com>
Sat, 9 Jan 2010 04:47:07 +0000 (20:47 -0800)
committerYing Wang <wangying@google.com>
Sat, 9 Jan 2010 04:47:07 +0000 (20:47 -0800)
commitc314d48b015a79867dfd055b8fb9f1e1fd44ede3
treea25a6c24a8e654042cffc179dba9070288405bac
parentaaa4c0120bc36155dd7e827eaaaf4e6890c43a37
parent62f142de0d0f744adef36c2ce735ded60bf5a101
resolved conflicts for merge of 494d8698 to master