tree 1828739c054617c3bfa5cb08c15e109c60faa99b
parent 64b556bdc9001475e0a19ed8e2a209bbff252912
parent d4d1d5a02b01af54f19dfd11c46999f909183663
author Jean-Baptiste Queru <jbq@google.com> 1291754832 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1291755109 -0800

resolved conflicts for merge of 78742e01 to stage-korg-master

Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905