| commit | 0cb5b5e89a90364ec78dd523b9e1a1cc11987c80 | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Fri Jan 23 20:02:14 2015 +0100 |
| committer | Sebastien Hertz <shertz@google.com> | Fri Jan 23 20:02:14 2015 +0100 |
| tree | 956288167d963c95c412e4ef4ee43fdd08861f82 | |
| parent | f73e9cb38f771c73a8370975907798d1ed20cdce [diff] | |
| parent | 29d50f9fe9ebbc32746eb9a186b2ad89c35f4b32 [diff] |
resolved conflicts for merge of 29d50f9f to lmp-mr1-dev-plus-aosp Change-Id: I800f6ab04e30d513590a414f7673d497aea33da4