commit | 1b2b754a3100c0aab4afffe5890276a3f91eb4cc | [log] [tgz] |
---|---|---|
author | Ravindra <c_rthat@codeaurora.org> | Wed Oct 07 17:00:57 2015 +0530 |
committer | Gerrit - the friendly Code Review server <code-review@localhost> | Thu Oct 08 00:01:50 2015 -0700 |
tree | d186bf9caef7c25cbcec663ac527ec6c7c172a1e | |
parent | 09ecabc3ea7a13d140a0c050afdafc6e9e2884a3 [diff] |
Fix to display merge icon on failure. Trigger a state change to incallui with the existing state on an unsuccessful merge in order to enable merge icon. Change-Id: I1c7baa7a2c2ccf277eff06d68da0b419ae587a19 CRs-Fixed: 815642