| commit | 6d8886ac46106bda18b26a0870ed144f225c560f | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Feb 11 22:32:05 2015 -0800 |
| committer | Tao Bao <tbao@google.com> | Wed Feb 11 22:32:05 2015 -0800 |
| tree | 9b78f91f2d51c0c41def362dafb4d6137eb18fab | |
| parent | ad5591f819466fc1c87d9ca76be8c06673ccce34 [diff] | |
| parent | e1e1cd9dfa1dd873c0563321f9dd73703933e578 [diff] |
resolved conflicts for merge of e1e1cd9d to lmp-mr1-dev-plus-aosp Change-Id: If01cb9c91c4f980d422896aa5ebe713f540d4fd1