tree b314a80f3ae6ac3b0e63439f7204e6334f9aa316
parent d0ffef4b43594e540cb867da18d4403b4f583622
parent 4b94c451d2c3aea27c007518318ea98671ae6ed3
author Jean-Baptiste Queru <jbq@google.com> 1292274373 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1292274373 -0800

resolved conflicts for merge of 4b94c451 to stage-korg-master

Change-Id: I07b974f96ca598677e58623050e4668822e68f23