tree 881bb55925a44abc52602c3b0acbf80955df3a93
parent 8659925532070807d881be62e457caa4a8dadcfd
author Kevin <kevhan@google.com> 1555631946 -0700
committer Kevin <kevhan@google.com> 1555632184 -0700

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