OSDN Git Service

Merge 5adc2d05
authorJean-Baptiste Queru <jbq@google.com>
Tue, 7 Jun 2011 20:10:15 +0000 (13:10 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 7 Jun 2011 20:10:18 +0000 (13:10 -0700)
commit0a6c12be9b17ce74ac0af017b353b72b25550cf0
tree348b50b97632fd4dc0f46b57903582eb16d9d8f1
parent45a3ad7d225495367a47440da118609b4940fe71
parent5adc2d054f483f247d80c6eb2522b8fca8b2861e
Merge 5adc2d05

Change-Id: I84a96fc4ca9db476e62959425f622fc88527e181