diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-05-14 21:59:53 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-05-14 21:59:53 -0700 |
| commit | a817ff9cf61daeb69e8b8382c80677e3e5c573a9 (patch) | |
| tree | 58d297721a7085f2260605bb564c8ad2fe76e7d8 /trusty/coverage/coverage_test.cpp | |
| parent | ac5cf925f86706d2bf89948e7cd3379376185d3b (diff) | |
| parent | 07db297045b33d5c0aaa37194da1616d764edd26 (diff) | |
resolved conflicts for merge of 07db2970 to jb-mr2-dev-plus-aosp
Change-Id: Idf344a1fc7e2f8ec76232ae14a00298ddd322a55
Diffstat (limited to 'trusty/coverage/coverage_test.cpp')
0 files changed, 0 insertions, 0 deletions