| commit | c71416613b37c3cf06e50cad8ceb60354a0f9bcd | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Thu Sep 25 09:33:15 2014 +0200 |
| committer | Sebastien Hertz <shertz@google.com> | Thu Sep 25 09:33:15 2014 +0200 |
| tree | 8fa9a003aed0ab98e196ed91338d936efdbadeb7 | |
| parent | 8651c904ab4543e2c69152aa6c23e34f4c355c17 [diff] | |
| parent | 266b4689731f2c69af0f2854aaab947cf6e89f84 [diff] |
resolved conflicts for merge of 266b4689 to lmp-dev-plus-aosp Change-Id: I5948c36b2d7032f24712cc8dfce11790cd259af1