OSDN Git Service

resolved conflicts for merge of 2576abf0 to master
authorDavid 'Digit' Turner <digit@google.com>
Fri, 2 Jul 2010 22:22:19 +0000 (15:22 -0700)
committerDavid 'Digit' Turner <digit@google.com>
Fri, 2 Jul 2010 22:22:19 +0000 (15:22 -0700)
commitcf385317417af76f20d2d579da05c0a336691e40
tree7120924251469aaac1de571283ca66f90574a89c
parentcd122865a53d1b5f9ae7ce46520911a0c02be643
parent2576abf0eddb86938d85210c96ea220f2d64d4fd
resolved conflicts for merge of 2576abf0 to master

Change-Id: Ibd3ed11f3cc27ff12c0464b0f56d7057be6a7b85