Merge proposals dependent on lp://staging/~bkerensa/ubuntu-nexus7/fix

lp://staging/~bkerensa/ubuntu-nexus7/fix has no merge proposals.