OSDN Git Service

resolved conflicts for merge of 047d943e to lmp-mr1-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Mon, 17 Nov 2014 19:26:42 +0000 (11:26 -0800)
committerElliott Hughes <enh@google.com>
Mon, 17 Nov 2014 19:26:42 +0000 (11:26 -0800)
commit58802c1a458fb32f9d42a5f1486f61270a55e0dd
treea25de9b47c806485750186097108196a529fd0b5
parent7b78a69d85dc3ee5e1f7f64607e0ae80d0aec0f6
parent047d943ee90c7582c08bafe6c2a6de132f12502f
resolved conflicts for merge of 047d943e to lmp-mr1-dev-plus-aosp

Change-Id: Ic0e230083f25ab5a026beae80a1ddef9ff60accb