OSDN Git Service

resolved conflicts for merge of 4b94c451 to stage-korg-master
authorJean-Baptiste Queru <jbq@google.com>
Mon, 13 Dec 2010 21:06:13 +0000 (13:06 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 13 Dec 2010 21:06:13 +0000 (13:06 -0800)
commitfae89a5076867dd2ab4d73abd959bbbf32a23336
tree1828739c054617c3bfa5cb08c15e109c60faa99b
parent3c41ac797afc9065897af3cdda870b0cc3f3d045
parent3436320d8fbd675ac5c46944a0428fbcd7aecc02
resolved conflicts for merge of 4b94c451 to stage-korg-master

Change-Id: I07b974f96ca598677e58623050e4668822e68f23