| commit | fc168f84695f492f2ad0eed3063145f425bebf45 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Aug 26 17:03:18 2015 -0700 |
| committer | Ying Wang <wangying@google.com> | Wed Aug 26 17:03:18 2015 -0700 |
| tree | fbff119ff8045ee84dae5ed3a425018af76d7680 | |
| parent | 1e120181f0a9240eca61dface4fb4530bf2594ab [diff] | |
| parent | 1a8c656704d949e14a4951d31a14b9a235eebe49 [diff] |
resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-dev Change-Id: Iadb7c55c246705ac10c6822b7bb5d71794ce485b