| commit | 1657bb97140f194f4839aaf13d2c30ec2f1262ce | [log] [tgz] |
|---|---|---|
| author | Dirk Rettschlag <dirk.rettschlag@gmail.com> | Fri Sep 20 10:27:56 2013 +0200 |
| committer | Dirk Rettschlag <dirk.rettschlag@gmail.com> | Fri Sep 20 10:27:56 2013 +0200 |
| tree | b5cd80b7ad03a502b3398221585dc7739ae458e0 | |
| parent | 86a12ae87fbd57409bef084cbc3778f4a4e417e1 [diff] |
Fix merge derp Change-Id: Ic51e308300514dcd2bab6baabb79ebd8e551b8c8 Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>