OSDN Git Service

resolved conflicts for merge of 4dcd2ee8 to master
authorDianne Hackborn <hackbod@google.com>
Mon, 1 Mar 2010 19:30:02 +0000 (11:30 -0800)
committerDianne Hackborn <hackbod@google.com>
Mon, 1 Mar 2010 19:30:02 +0000 (11:30 -0800)
commit664e53dd23a76c18b99addc61d4b84aee97124ed
tree74d51c4e9413b2bcae28b47e10f67bb1fca558fa
parente26f4a308fbd4809b53262be15b8dd378bb4e10b
parent05d73503297f1a739e61389eb637725d13477f41
resolved conflicts for merge of 4dcd2ee8 to master