| commit | 8564e13b37d372da78bce08f34a3610795ae173c | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Dec 29 17:01:55 2014 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Mon Dec 29 17:01:55 2014 +0000 |
| tree | ad7f94b921e4ef14964c7f153b050302c8f030bc | |
| parent | b915a420a6a205d30c0181d3fc13078fc6d37a3c [diff] | |
| parent | 2efb95665d00d422b2a84f575e8acddd598311ad [diff] |
resolved conflicts for merge of 2efb9566 to lmp-mr1-dev-plus-aosp Change-Id: I4313941f3561176ce9f6ab055678fb626e570107