| commit | 50649111f0d60331e81eae622fee33d76d3e49fe | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Dec 10 13:42:32 2014 -0800 |
| committer | Elliott Hughes <enh@google.com> | Wed Dec 10 13:42:32 2014 -0800 |
| tree | 82164b6d42a61d221d7a5628fd0d39e5fd60b4a4 | |
| parent | a19bc68255d5221e706058d1d81f3dd619648108 [diff] | |
| parent | 2598f0ad55044c92553e45a5d46ee7e91ba4a7fe [diff] |
resolved conflicts for merge of 2598f0ad to master Change-Id: I25700b26d661ed26e33104266f3fe8b1655a1fde