| commit | b5ce284aa8e738de051572ab37a01d52fa7b1dac | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Oct 29 12:31:48 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Oct 29 12:31:48 2014 -0700 |
| tree | cae2156cba3962f8476066a0c407293a8a888342 | |
| parent | 7192f0d2acafb2599988d463a42a2dcfd80c25bc [diff] | |
| parent | d3389e2f32478bba4eddff3b7b63e07b74008ea7 [diff] |
resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp Change-Id: Ic4969a59ef22d4911f74cc1e75ea5ccfab59b770