| commit | 8418764eb33ef9023db8679ee1133c83a88329ed | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Tue Oct 14 09:11:57 2014 +0200 |
| committer | Sebastien Hertz <shertz@google.com> | Tue Oct 14 09:11:57 2014 +0200 |
| tree | 24bd09bc2394fed8f394af5ba4a9737710274e0b | |
| parent | b050c30751e8f766fcdb06371e05060a215376e7 [diff] | |
| parent | 5d1c1bbd4c8a1727027d0ae69277af6f6f6badf3 [diff] |
resolved conflicts for merge of 5d1c1bbd to lmp-dev-plus-aosp Change-Id: Ibf08c35044e3f6ac2aac1bf4f418f35a4ecc42e4