| commit | e9985026d78041cc9ea80ee7c59dd733bff44495 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Tue Feb 24 16:57:19 2015 -0800 |
| committer | Mark Salyzyn <salyzyn@google.com> | Thu Feb 26 10:00:19 2015 -0800 |
| tree | 1a81b51e29fa8345f963de00cd427608a304bea9 | |
| parent | 4ccd0b98b058232d43fe507eedae07cf50047377 [diff] | |
| parent | 6452c4ee74f245f0814e0cf44f2b6c1ad7a18fdf [diff] |
resolved conflicts for merge of 6452c4ee to lmp-mr1-dev-plus-aosp Change-Id: I23d5d8132f03a9dee9dd4524b582ccc1567643a5