tree 2bf7d5b77a4aeb560e5441e787770cc5dcdb3f44
parent 945c23c0892c375413100cdaaf26cd8dfe8799f3
parent 250bab05a83fd6c6f2ab83329a8ef77f5b50d608
author David Pursehouse <david.pursehouse@sonymobile.com> 1444881687 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1444881687 +0000

Merge changes from topic 'conflicts-with-merge' into stable-2.11

* changes:
  Fix "Conflicts With" when current change is a merge commit
  Fix "Conflicts With" when other change is a merge-commit