| commit | c0748a19909d8863f54ae0482bf1614421f19dd8 | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Thu Jun 26 18:44:26 2014 +0900 |
| committer | Jean Chalard <jchalard@google.com> | Thu Jun 26 18:44:54 2014 +0900 |
| tree | 930bafbab45eba580803071de04ef0e89ca0d24f | |
| parent | 310bb2c76f0a7a5cf97b47d029096d6296cdfd0b [diff] |
Fix the build That was a merge not well resolved by git >.> Change-Id: I3cd042d6a5206daf1e9942358405d647c67423dd