| commit | 87332a7109610d02ac7f5db6af99d3a11813d5c1 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Oct 01 22:03:58 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Wed Oct 01 23:26:06 2014 -0700 |
| tree | 19696ad7c6d520eeaff870636aa953a96adcc530 | |
| parent | bee6dfe09d4381f9ddf666fd04012c662f31e7fd [diff] | |
| parent | 1dcc75b2dbaef7c3bb3410187bf38cabca0d1aea [diff] |
resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aosp Change-Id: I8f7cbd971beae3ab134195e612d705860665142f