| commit | 297522bd658b417600ea244b3f403d9130c0a446 | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Thu Nov 16 11:25:32 2017 -0800 |
| committer | sqian <shuoq@google.com> | Thu Nov 16 11:25:32 2017 -0800 |
| tree | 9f55d87bf55d4953e89140c4720ba0938a53cff1 | |
| parent | 9545fed27597d09dcfa63f6d1259ed2fe8817fb7 [diff] |
Fix merge conflict CL for o-dr hashing Bug: 65230472 Test: run vts Change-Id: I25e2e8390d7d4c2ce45c0c0378435754ddb81ac0