| commit | 8030b0b0265bc1388f5aa9c705afaa57028de4d2 | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Thu Sep 11 11:53:40 2014 +0200 |
| committer | Sebastien Hertz <shertz@google.com> | Thu Sep 11 11:53:40 2014 +0200 |
| tree | 95892978e4747dd5fe739745fe8b802e0083eb52 | |
| parent | e2dd5df508669ee3743138fc35893001cde4fe11 [diff] | |
| parent | d9a043f9530e22d3e83ea72254078b75fc9a5bb9 [diff] |
resolved conflicts for merge of d9a043f9 to lmp-dev-plus-aosp Change-Id: I595596ea8953cad50d501e86d80ffba91392d859