| commit | b07ef1db3ebf750707ff63722cd7ef0a3a0e1ec1 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <david.pursehouse@sonymobile.com> | Thu Oct 15 04:01:27 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Oct 15 04:01:27 2015 +0000 |
| tree | 2bf7d5b77a4aeb560e5441e787770cc5dcdb3f44 | |
| parent | 945c23c0892c375413100cdaaf26cd8dfe8799f3 [diff] | |
| parent | 250bab05a83fd6c6f2ab83329a8ef77f5b50d608 [diff] |
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