| commit | 188a8774c95133849e26c53ad551e347c71c4b8c | [log] [tgz] |
|---|---|---|
| author | Scott Rowe <scottrowe@google.com> | Tue Jan 06 19:30:11 2015 -0800 |
| committer | Scott Rowe <scottrowe@google.com> | Tue Jan 06 19:30:11 2015 -0800 |
| tree | 3ee31d060dfda054a5bd2cfd1583efa74bbc276d | |
| parent | a517e81e2b1594da3e12c0547aabac5f357ce97b [diff] | |
| parent | ea0137ef54e5cd43d4ae3a54d90fdbc644146247 [diff] |
resolved conflicts for merge of ea0137ef to lmp-mr1-dev Change-Id: If0a38ebe4e72ec6c1a3683fab1302ee0fdfe4214