| commit | 837b140c825c9f7342483ea9f39d4f872bcb2e3c | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Thu Oct 30 11:06:41 2014 +0100 |
| committer | Sebastien Hertz <shertz@google.com> | Thu Oct 30 11:06:41 2014 +0100 |
| tree | edbc60939839351797fbaac249945b357703ad9e | |
| parent | 1b9813ad0bed9435fa4ec1631ddffc9ad5190d5f [diff] | |
| parent | f44baef1623c266d2b840070f0025d3a38a71566 [diff] |
resolved conflicts for merge of f44baef1 to lmp-mr1-dev-plus-aosp Change-Id: I754fa19727d0c1db7ca2110b7cae51c9f7c15e00