Merge proposals dependent on lp://staging/~nskaggs/phablet-tools/add-cmake-dependency

lp://staging/~nskaggs/phablet-tools/add-cmake-dependency has no merge proposals.