| commit | 1a927f46dcc43dc13ae0661cf0067eae920ff6ed | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jun 03 14:02:53 2015 -0700 |
| committer | Daniel Xie <dxie@google.com> | Wed Jun 03 21:21:34 2015 +0000 |
| tree | ebb2908ece04cef5200b82b7348a0bd51d0b7d69 | |
| parent | c688aa62d03b4c13835924a4b6dc63f370938c06 [diff] | |
| parent | 42b3de741bafba4acbe0435893e7248622eaab9f [diff] |
resolved conflicts for merge of 42b3de74 to lmp-mr1-app-dev Change-Id: I9c21d9f5dbc269bb0066d184895c9dca691a1f98