tree f5c1853897f74fc6b11553e4f62d60448712cd7c
parent 48514580eec43561c15b6df6ae59a958a4606caf
parent 509ab383d792a0032d75f88c25f12fcf81d29d94
author Marco Miller <marco.miller@ericsson.com> 1558809192 -0400
committer Marco Miller <marco.miller@ericsson.com> 1558809197 -0400

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Add .apt_generated to .gitignore
  Add eclipse-out to .gitignore

Change-Id: I8da3b7c9f2046c25e14900b79a77e70bf679f4b2