| commit | a91e5368f06d1f1fc8337d8c71959e924e6d8fe6 | [log] [tgz] |
|---|---|---|
| author | Calvin On <con@google.com> | Wed Feb 22 15:16:42 2017 -0800 |
| committer | Calvin On <con@google.com> | Wed Feb 22 15:36:53 2017 -0800 |
| tree | f0630978aa7e4d62b98969d68b28db47f74d3083 | |
| parent | f764962b0d58008530955b70af1ebf68beb8d4ba [diff] | |
| parent | f17c1d488840a00118be7b93be11bdae66f23189 [diff] |
resolve merge conflicts of f17c1d488840 to master OCL: http://ag/1932572 Test: refactoring CL, with unit tests Change-Id: I5da27ee70afb8bf6e5fe9f6f3b545cd26d5c8d20