| commit | 2a7b01c95bcef8ba0255d6b8308567ee4694fc7b | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@google.com> | Fri May 09 02:13:22 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri May 09 02:13:23 2014 +0000 |
| tree | 4300366aa90070acf678182f063f1021b1d8cf5f | |
| parent | 4c1516403c739c26a1cf99e76f5f11e9339ae3cd [diff] | |
| parent | 6ca0579cc42285bcd2394541c132d33b7e6636c4 [diff] |
Merge "resolve merge conflicts of 5d7058e to master."