OSDN Git Service

Undo previous merge
authorJean-Baptiste Queru <jbq@google.com>
Mon, 21 Jun 2010 19:33:38 +0000 (12:33 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 21 Jun 2010 19:37:08 +0000 (12:37 -0700)
Change-Id: I7b8b62a8f69a6db551cfef3a5b4bc2de8f97d900


Trivial merge