OSDN Git Service

Reconcile korg and goog
authorJean-Baptiste Queru <jbq@google.com>
Thu, 3 Feb 2011 15:54:17 +0000 (07:54 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 3 Feb 2011 15:55:04 +0000 (07:55 -0800)
Change-Id: I10f6dee5046fcf802d5d09668bd61a79506475ae


Trivial merge