OSDN Git Service

manual merge
authorJean-Baptiste Queru <jbq@google.com>
Mon, 12 Apr 2010 22:32:13 +0000 (15:32 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 12 Apr 2010 22:32:13 +0000 (15:32 -0700)
commit41c04c89b0ea949b9119ce732ef7b1c537b0d552
treec4333b1d19b4dea3beb4fd5c98a3afcd88572544
parent089582b02a668143ea937dde695d6c4a3b0e4b4b
parent46ef879aeb4fbe440f0c70b2b0d8cd8025a3e823
manual merge

Change-Id: I9cdacbf1e445e7f6cf06ad03df541a744c242774