OSDN Git Service

resolved conflicts for merge of 37a00a36 to master
authorSuchi Amalapurapu <asuchitra@google.com>
Tue, 9 Feb 2010 07:55:56 +0000 (23:55 -0800)
committerSuchi Amalapurapu <asuchitra@google.com>
Tue, 9 Feb 2010 07:55:56 +0000 (23:55 -0800)
commit83d5c7130413c56236293fb2ddd1b2fdafa60d5d
tree45e0d99744113b2c0b8536dea8553404996a0393
parentb2a5affce5ecf764ac841f68bd6f2d2d0cf6caa5
parentddd670c816cb2f90f1ad38b90ddb3214966e50cc
resolved conflicts for merge of 37a00a36 to master