OSDN Git Service

resolved conflicts for merge of ee27dd35 to master
authorJean-Baptiste Queru <jbq@google.com>
Tue, 7 Dec 2010 21:17:37 +0000 (13:17 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 7 Dec 2010 21:17:37 +0000 (13:17 -0800)
commita23576889d6cef873d8cf16c7520d50042daa384
treebb8819642c406973156976ccde649407927dea05
parent6e42d3ffe6d9b647a7632d989a4755aae1c90617
parent82b2a4b94c52846128ea57afe27b388d4869b0bd
resolved conflicts for merge of ee27dd35 to master

Change-Id: Ia9f4ea86b8554ff04a3aa6b9e065239ae73740e7