| commit | 0d10c19993ab2848953f67bdf371b19790cde5d6 | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Fri Jan 23 09:33:21 2015 +0100 |
| committer | Sebastien Hertz <shertz@google.com> | Fri Jan 23 09:33:21 2015 +0100 |
| tree | 0a1ea3ee132af887e024b521c49170d9dd0bb0a2 | |
| parent | 7b32c17eee2b5d0a1f1c983034c9e427d9299f8e [diff] | |
| parent | 2ac61e31dc40ccb3a63db1036cc89474c0a1c262 [diff] |
resolved conflicts for merge of 2ac61e31 to lmp-mr1-dev-plus-aosp Change-Id: I935fadf70a188bd6ec6bfbe73c330b1df032695f