OSDN Git Service

resolved conflicts for merge of aedc14b1 to lmp-dev
authorElliott Hughes <enh@google.com>
Fri, 11 Jul 2014 17:03:35 +0000 (10:03 -0700)
committerElliott Hughes <enh@google.com>
Fri, 11 Jul 2014 17:03:35 +0000 (10:03 -0700)
commit7e43f0d40d3189ca219c6758f61ffe2a2d411ee2
treec9ed96cfb1199eec5b807a3d7bbc9102b0235523
parente20bbaf8bbfb41b690e55be66eb327ebdcc61629
parentaedc14b166e9eb1213637cf7ebf8e08ce29ab0dd
resolved conflicts for merge of aedc14b1 to lmp-dev

Change-Id: I36d3a6ca42778686f1f2971ae72cd3b7b156a3da