| commit | 1345aa365e8baae25d2b3a859a4858fffbe6b11f | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Thu Mar 24 14:33:39 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Mar 24 14:33:39 2016 +0000 |
| tree | caeaad92dd1a4cd7b02bd8f670c257fe6a5267cd | |
| parent | 594973c83bb9187e392a7daf61b570dfe0aa3e08 [diff] | |
| parent | 484fb9fde79c9c36d186cd2c7cfd8ad51f2ffead [diff] |
Merge "Fix stub_test after semantic conflicting merge."