tree 31594ee6baf81fcf20499f29b3d4e9300c8cde4c
parent 84af896c854e6c4175cb79130ac7c0145d5a69f7
parent 2acbabd76641ee8011c437cd9818305ffee2b21e
author Marco Miller <marco.miller@ericsson.com> 1606428715 -0500
committer Marco Miller <marco.miller@ericsson.com> 1606428715 -0500

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Remove no longer applicable .mailmap file contents

Change-Id: I63c006a6245bdc026ad54d8213b2d251c9708acf