| commit | cbd67e87de84e2015c14f0b6067c8267d1ddd972 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Fri Aug 12 18:05:57 2016 -0700 |
| committer | Adrian Roos <roosa@google.com> | Fri Aug 12 18:05:57 2016 -0700 |
| tree | dfe64de8c1335d41390ebbfdb88ffab544b67426 | |
| parent | e0b740865fa0a677787dde8f1597ffadca088995 [diff] | |
| parent | 523ec5476d12ca500a386815719e66a287394ba5 [diff] |
resolve merge conflicts of 523ec54 to master Change-Id: I2f31db207be03a01be7786a0c93abdbb6b84fbf6