| commit | 3a7ceec7d58d601ac9e92208f5dec7bc8c440631 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed Jan 14 20:49:37 2015 -0800 |
| committer | Brian Carlstrom <bdc@google.com> | Wed Jan 14 20:49:37 2015 -0800 |
| tree | aa07293f7161d3d1764b161dc3d8ab6810ad5dd5 | |
| parent | 33d0392d3e4c42a7d48e8bd1210a1525aca8c2d3 [diff] | |
| parent | da562f3d514fbf52059c5d981d6db366bd4c5927 [diff] |
resolved conflicts for merge of da562f3d to master Change-Id: I168ffb910b5962ea53660d1901fa5a8045a9df28