| commit | 290bf8214da0621bf9ddefc65a3bd310b935971f | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Tue Aug 12 17:35:01 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Aug 12 16:54:49 2014 +0000 |
| tree | a531faa3879ad7c9bee409cf9b00662d33c51368 | |
| parent | 66386248003a46ecbe4fac99aec902cfd0942847 [diff] | |
| parent | c30a7257f1d0cc79931f38e8cbbb45aab8682acb [diff] |
Merge "Prevent merge conflicts."