| commit | 8840754c5bc44c7e11ed5e9acc15e9569f5814c5 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Jan 08 14:00:56 2015 -0800 |
| committer | Marco Nelissen <marcone@google.com> | Thu Jan 08 14:00:56 2015 -0800 |
| tree | b3aee3af2d94e1c84729d1d5579a6177b5b05b70 | |
| parent | 7993d6b343f2723872dac085756743630371454d [diff] | |
| parent | 2702d5a073dce89fa3d97c304264b719b187c9fe [diff] |
resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aosp Change-Id: Ic9841f0a66930f57a5ebea527c6a841d7c49cccf