| commit | ed4f566a926d935ee7e2a158d75bbd050ef85778 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Wed Jan 14 19:22:09 2015 -0800 |
| committer | Chad Brubaker <cbrubaker@google.com> | Wed Jan 14 19:22:09 2015 -0800 |
| tree | 5d8afabab647abe8a7d84dcb65cdcac93b327c90 | |
| parent | c7c4d777f08ecbd0d6d3fea334e7f652e548da2e [diff] | |
| parent | 4e6d3b7f4124ebfe5e92993c4445c134661a0106 [diff] |
resolved conflicts for merge of 4e6d3b7f to master Change-Id: I35dfcc7918b1f343d214979bf27a78cbd86972e2