tree 817942a2584873034b5988807efe042a0a3266c5
parent 4ba81d1c6f329f3a67fef47c948a48c2a8c90a73
author Kevin <kevhan@google.com> 1555631946 -0700
committer Kevin Han <kevhan@google.com> 1556047550 +0000

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
(cherry picked from 420115e7f1ccb881502ce126d74583eba8b2bb8d)