| commit | eb2a7346c2270a7fb3cc3e127f7b52ba20df1fb7 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Jan 14 11:10:33 2015 -0800 |
| committer | Marco Nelissen <marcone@google.com> | Wed Jan 14 11:10:33 2015 -0800 |
| tree | 1dbb1c050687cda6d0877c29d60ac80d281a05b3 | |
| parent | 17c933cc07be9656aee8afc82dc866a67b3fd78e [diff] | |
| parent | 9e5929ad530d73bca491c2c1b6b96d3bb1783581 [diff] |
resolved conflicts for merge of 9e5929ad to lmp-mr1-dev-plus-aosp Change-Id: I4c4c4a035cd4761b7b891c277a0a88229e3c4e87