| commit | c2a0b4482d7144e8382346ea4c22c7b89368fec0 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Thu Oct 02 14:32:37 2014 +0100 |
| committer | Neil Fuller <nfuller@google.com> | Thu Oct 02 14:32:37 2014 +0100 |
| tree | f0ec3fbeee8dde1d56ad85c59d858ec093d5eb9d | |
| parent | f08384c763d2e57c05e0be4325c267d12fc516d4 [diff] | |
| parent | ee665151a4c6359cbfbb9a6795aa9097c4622083 [diff] |
resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7