| commit | f7effd82b468983f502a90a1198cc09f6ac6c41d | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Thu Sep 11 12:03:21 2014 +0200 |
| committer | Sebastien Hertz <shertz@google.com> | Thu Sep 11 12:03:21 2014 +0200 |
| tree | 95892978e4747dd5fe739745fe8b802e0083eb52 | |
| parent | 8030b0b0265bc1388f5aa9c705afaa57028de4d2 [diff] | |
| parent | bb2e4d7d2d863e2d10876a469642784c9aeafda6 [diff] |
resolved conflicts for merge of bb2e4d7d to lmp-dev-plus-aosp Change-Id: I09494f20cbdfde03dc2f1d05fddb17b2acedb63e