| commit | 420115e7f1ccb881502ce126d74583eba8b2bb8d | [log] [tgz] |
|---|---|---|
| author | Kevin <kevhan@google.com> | Thu Apr 18 16:59:06 2019 -0700 |
| committer | Kevin <kevhan@google.com> | Thu Apr 18 17:03:04 2019 -0700 |
| tree | 881bb55925a44abc52602c3b0acbf80955df3a93 | |
| parent | 8659925532070807d881be62e457caa4a8dadcfd [diff] |
Fix task adapter notify merge conflict Resolved merge conflict of ag/7093095 incorrectly and accidentally kept both HEAD and CL changes. Resolved in this CL. Test: Manual test Change-Id: Iad42ab12b486201f496c83f99c8c6094273543f3