| commit | f2235b6a48db2e16b52711570bf2a0d0cb0b0d90 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Thu Nov 20 16:38:06 2014 -0800 |
| committer | Chris Craik <ccraik@google.com> | Thu Nov 20 16:38:06 2014 -0800 |
| tree | 159f121d1330bba957764704de13720e785f3e3b | |
| parent | cd24a6d70b54c79605e51fcc6a249313e9c25a51 [diff] | |
| parent | 57b641a2ed87f2827399c363053436cba88bee75 [diff] |
resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp. Change-Id: I1be708f5a0cd4d64021a57f1063d54330f1d2d7e