| commit | b5229b960131cc0c2aee3ff29294e9e50bb250cd | [log] [tgz] |
|---|---|---|
| author | Chung-yih Wang <cywang@chromium.org> | Sun Mar 02 06:12:40 2014 |
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | Sun Mar 09 02:56:49 2014 |
| tree | af45b3b609a64bcb62a00dcb65aade588188f7cc | |
| parent | a5fee548a7146396cc09bfb3ba1a92404d218e81 [diff] |
tests/spring1/merge_{1..5}: Add tests
These are finger merge mistakes that Dave Moore saw on spring.
BUG=chromium:346719
TEST=These are the tests
Change-Id: Ida8ef564dede325bcd0587ae7b1498e6b5de1f2a
Reviewed-on: https://chromium-review.googlesource.com/188484
Reviewed-by: Andrew de los Reyes <adlr@chromium.org>
Commit-Queue: Chung-yih Wang <cywang@chromium.org>
Tested-by: Chung-yih Wang <cywang@chromium.org>