tree 8858c75ea3381c2e16fb9232d5eff68b1f62fc88
parent 789f6b9fc63ce8497a9db2aa1167bfcef987a268
parent 2841245a7a13f4c3ab762d5b8c7df6283309d9f2
author Marco Miller <marco.miller@ericsson.com> 1550435987 -0500
committer Marco Miller <marco.miller@ericsson.com> 1550436025 -0500

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Fix test dependencies for in-tree build

Change-Id: I9e63aaf704a5acc310fb44f720b73f78edbff52d