| commit | dba76ab779821ebb404cd5d725e0b852b9619ed5 | [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 | a1422fd20cce18d9b73e505216ad05d5f136fd0c | |
| parent | 35de6be75647eb501c4697bcc9ff5d711da28b94 [diff] | |
| parent | bdc64cd25a671fc6dca4e01382ab6671c324a3ea [diff] |
resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7