| commit | b8c66380ba649264bfff1a15d285bb7a7e4d1e08 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Wed May 28 10:18:28 2014 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Wed May 28 10:18:28 2014 +0200 |
| tree | f3e493daa18566597f49fb00132aa4624608cca6 | |
| parent | fb594d8e4f24f9c845d49ed72ed15e92df46130b [diff] | |
| parent | 838c441e610906889ac9ac932235782810c1043d [diff] |
resolve merge conflicts of 838c441 to master. Change-Id: Ia3861aabaa7acd2201da1d70664342a63711e316