OSDN Git Service

resolved conflicts for merge of 78742e01 to stage-korg-master
authorJean-Baptiste Queru <jbq@google.com>
Tue, 7 Dec 2010 20:47:12 +0000 (12:47 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 7 Dec 2010 20:51:49 +0000 (12:51 -0800)
commitf83c5e5eee3395be6a444cde68a135902aa4d9e7
tree1828739c054617c3bfa5cb08c15e109c60faa99b
parent64b556bdc9001475e0a19ed8e2a209bbff252912
parentd4d1d5a02b01af54f19dfd11c46999f909183663
resolved conflicts for merge of 78742e01 to stage-korg-master

Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905