tree 791f1ebc337aaaf72d75b8df06130652ed5af5c4
parent ab8b1b258477a5d04a389dd56b5583e13ec675ea
parent 646cc1e0c8f4380b004746232695ff7ada7318e1
author David Pursehouse <dpursehouse@collab.net> 1542133613 -0800
committer David Pursehouse <dpursehouse@collab.net> 1542133613 -0800

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Add missing init step declaration in manifest

Change-Id: I26c5d2732d1fe0ecb514b431cf3977aa4e4fc554