| commit | fa11fd5bb2e9c5e00f7fecbbe76c279193182cee | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Mon Aug 24 08:36:50 2015 -0700 |
| committer | Robert Shih <robertshih@google.com> | Mon Aug 24 08:36:50 2015 -0700 |
| tree | 500f0f9272264d34602d7942943af7a7e21c5b9a | |
| parent | 47b90fe20d6ea9409c7009926c60fa33985f4211 [diff] | |
| parent | 327afffb24c8baaf77f42cbbeb9aca25eddee7b4 [diff] |
resolved conflicts for merge of 327afffb to lmp-mr1-ub-dev Change-Id: I6c1369f05bbeb83e2152b8dae35f7a53328f7239