| commit | 120517a5b49d9917fc76e2a24e36a803771010b5 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Wed Jun 18 20:05:06 2014 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Wed Jun 18 20:06:44 2014 +0200 |
| tree | 05f2f72429d08b54361168cb05d1439db40db558 | |
| parent | 71e0dd327215a72c38e67cd637c031872173f4ac [diff] | |
| parent | 61a2b2055a887af3d2db3f146365c9ead29bf122 [diff] |
resolved conflicts for merge of 61a2b205 to master Change-Id: If0b21f84a8be24d211be233d919c5883dcc0471f