| commit | 44df954fe8275cdad88c3d54a41c4d56937f929b | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Thu Sep 18 14:57:46 2014 +0200 |
| committer | Sebastien Hertz <shertz@google.com> | Thu Sep 18 15:08:16 2014 +0200 |
| tree | 8b2ac8c8f5028d892b26d6ef81dc8f19e4c30a5d | |
| parent | 98002a2023ff222f7986e11e0dfccacbc32b8a50 [diff] | |
| parent | 6da664b21256c51819caedacc81cbdb7ddccb6ec [diff] |
resolved conflicts for merge of 6da664b2 to lmp-dev-plus-aosp Change-Id: I9b243f50ffffb2457ee859a099ab29ae83f9fd82