| commit | df1525e776ebae2075a6cee78337bff40e6cba47 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Tue Nov 25 13:05:03 2014 -0800 |
| committer | Lajos Molnar <lajos@google.com> | Tue Nov 25 13:05:03 2014 -0800 |
| tree | acb322587cd1121935134bb2209215d09298dad3 | |
| parent | 1fb4fdadc99134dd8b3b1ade9d9275cd5dcac053 [diff] | |
| parent | 85bbb7c3d8c9e6e55c0147fd1627e4eefaf6b865 [diff] |
resolved conflicts for merge of 85bbb7c3 to lmp-mr1-dev-plus-aosp Change-Id: Iab84a6f2aface8611d22efdf64ea888709e4c376