OSDN Git Service

merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Wed, 11 Nov 2009 16:26:31 +0000 (08:26 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 11 Nov 2009 16:26:31 +0000 (08:26 -0800)
commitdebe2b7f793e3287ee1e3574a79fe696c0926d37
tree1de0bdf145436d2ce71bb665124fc24871ace417
parent39a4377f6fcce9bf4ca4ef3af82fd44ab4d323d0
parent4511f47c50b39b02eb04eaac8e6a660c29ea8444
merge from open-source master