tree 438d9ea698487c483483c05314d13821e6f5d56f
parent e5c1ada416ef2d0010fe59677437cda5ff1e744b
parent df3e687925f0d2967d27433ee50584c54eca6ad1
author Marco Miller <marco.miller@ericsson.com> 1606429239 -0500
committer Marco Miller <marco.miller@ericsson.com> 1606429239 -0500

Merge branch 'stable-3.2' into stable-3.3

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

Change-Id: If15df802e23a6e2cc777aa5c4e835046783eace0