| commit | 29f4d9f9ea58c19c3c9ea624a0c88643eb48866d | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Wed Jan 14 13:51:45 2015 -0800 |
| committer | Chad Brubaker <cbrubaker@google.com> | Wed Jan 14 13:51:45 2015 -0800 |
| tree | 39a2a9503af1a947655a0fd6adb3ad87c8091499 | |
| parent | c626773562716168ce710320ce1e36d99fd6664a [diff] | |
| parent | 3d64a8508aedaaeb2f8322762b0dcade0b33d2f5 [diff] |
resolved conflicts for merge of 3d64a850 to lmp-mr1-dev-plus-aosp Change-Id: Ieed2c2a3b9977c30bc5318317c91c29907aa1377