OSDN Git Service

resolved conflicts for merge of c00d2ddc to master
authorSvetoslav Ganov <svetoslavganov@google.com>
Fri, 28 Oct 2011 22:40:32 +0000 (15:40 -0700)
committerSvetoslav Ganov <svetoslavganov@google.com>
Fri, 28 Oct 2011 22:40:32 +0000 (15:40 -0700)
commit9bb9fcaeb1f170c6a91057b495edd463df9062c5
tree1d90b398fb949e1e316b658c863f2f87f7814afb
parentaf80315be06dea554231a5fb8d3f603dd14b149c
parentd7967f79b3f6790d2f07c90e863d402afb99ac76
resolved conflicts for merge of c00d2ddc to master

Change-Id: I075cc5b5df2909152ee463f8a0c7534344b47c62