tree e4aedb6cc7a52dbb94ce801b282790bde8b6073d
parent 510f7c604061eab81a8af0a83cba01fa41dc8312
parent ba18ec711b7d90d5e231f1b20f29b00398094930
author David Pursehouse <dpursehouse@collab.net> 1528794605 +0900
committer David Pursehouse <dpursehouse@collab.net> 1528794605 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Rename dependencies to align with core

Change-Id: Ib8f809b1d38431d6a247cc4b972a4ad0e5ba41b7