tree 002cfc6ca3bb86a5a5bf8ea3f96227aafdfcf11a
parent 209c4ab771b52b688b681df6a06cf8583c9c0b05
parent d5dc3686a530fb7b970df04d058c445fcd317488
author Marco Miller <marco.miller@ericsson.com> 1558808802 -0400
committer Marco Miller <marco.miller@ericsson.com> 1558808815 -0400

Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: Ie660ba542e101b005f8ee54efb6b197ddb3b2ce7